pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 20:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

asm update

Browse Source
This commit is contained in:
Ethan Roseman 2020-11-23 14:48:06 -05:00
parent 96a2d67c2e
commit 83c1c2196d
12 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
asm/nonmatchings/code_181810/EndActorSpeech.s
View File

@ -33,7 +33,7 @@ glabel EndActorSpeech
/* 181C20 80253340 AC22FA70 */ sw $v0, %lo(gSpeakingActorIdleAnim)($at)
/* 181C24 80253344 2402FF81 */ addiu $v0, $zero, -0x7f
/* 181C28 80253348 16220002 */ bne $s1, $v0, .L80253354
/* 181C2C 8025334C 00000000 */ nop
/* 181C2C 8025334C 00000000 */ nop
/* 181C30 80253350 8E510148 */ lw $s1, 0x148($s2)
.L80253354:
/* 181C34 80253354 0C09A75B */ jal get_actor
@ -49,7 +49,7 @@ glabel EndActorSpeech
/* 181C5C 8025337C 3C01802A */ lui $at, %hi(gSpeakingActorPart)
/* 181C60 80253380 AC22FA78 */ sw $v0, %lo(gSpeakingActorPart)($at)
/* 181C64 80253384 0C04971C */ jal close_message
/* 181C68 80253388 00000000 */ nop
/* 181C68 80253388 00000000 */ nop
/* 181C6C 8025338C 0C03A6D5 */ jal increment_status_menu_disabled
/* 181C70 80253390 AE400070 */ sw $zero, 0x70($s2)
.L80253394:
@ -63,7 +63,7 @@ glabel EndActorSpeech
/* 181C90 802533B0 86220150 */ lh $v0, 0x150($s1)
/* 181C94 802533B4 C6200144 */ lwc1 $f0, 0x144($s1)
/* 181C98 802533B8 44821000 */ mtc1 $v0, $f2
/* 181C9C 802533BC 00000000 */ nop
/* 181C9C 802533BC 00000000 */ nop
/* 181CA0 802533C0 468010A0 */ cvt.s.w $f2, $f2
/* 181CA4 802533C4 8E220000 */ lw $v0, ($s1)
/* 181CA8 802533C8 30428000 */ andi $v0, $v0, 0x8000
@ -72,12 +72,12 @@ glabel EndActorSpeech
/* 181CB4 802533D4 86220152 */ lh $v0, 0x152($s1)
/* 181CB8 802533D8 C6200148 */ lwc1 $f0, 0x148($s1)
/* 181CBC 802533DC 44821000 */ mtc1 $v0, $f2
/* 181CC0 802533E0 00000000 */ nop
/* 181CC0 802533E0 00000000 */ nop
/* 181CC4 802533E4 468010A0 */ cvt.s.w $f2, $f2
/* 181CC8 802533E8 92220191 */ lbu $v0, 0x191($s1)
/* 181CCC 802533EC 46020000 */ add.s $f0, $f0, $f2
/* 181CD0 802533F0 44821000 */ mtc1 $v0, $f2
/* 181CD4 802533F4 00000000 */ nop
/* 181CD4 802533F4 00000000 */ nop
/* 181CD8 802533F8 468010A0 */ cvt.s.w $f2, $f2
/* 181CDC 802533FC 08094D0D */ j .L80253434
/* 181CE0 80253400 46001000 */ add.s $f0, $f2, $f0
@ -85,13 +85,13 @@ glabel EndActorSpeech
/* 181CE4 80253404 86220152 */ lh $v0, 0x152($s1)
/* 181CE8 80253408 C6220148 */ lwc1 $f2, 0x148($s1)
/* 181CEC 8025340C 44820000 */ mtc1 $v0, $f0
/* 181CF0 80253410 00000000 */ nop
/* 181CF0 80253410 00000000 */ nop
/* 181CF4 80253414 46800020 */ cvt.s.w $f0, $f0
/* 181CF8 80253418 92220191 */ lbu $v0, 0x191($s1)
/* 181CFC 8025341C 46001080 */ add.s $f2, $f2, $f0
/* 181D00 80253420 00021042 */ srl $v0, $v0, 1
/* 181D04 80253424 44820000 */ mtc1 $v0, $f0
/* 181D08 80253428 00000000 */ nop
/* 181D08 80253428 00000000 */ nop
/* 181D0C 8025342C 46800020 */ cvt.s.w $f0, $f0
/* 181D10 80253430 46001000 */ add.s $f0, $f2, $f0
.L80253434:
@ -103,7 +103,7 @@ glabel EndActorSpeech
/* 181D28 80253448 27A20020 */ addiu $v0, $sp, 0x20
/* 181D2C 8025344C AFA20010 */ sw $v0, 0x10($sp)
/* 181D30 80253450 44830000 */ mtc1 $v1, $f0
/* 181D34 80253454 00000000 */ nop
/* 181D34 80253454 00000000 */ nop
/* 181D38 80253458 46800020 */ cvt.s.w $f0, $f0
/* 181D3C 8025345C 46001080 */ add.s $f2, $f2, $f0
/* 181D40 80253460 27A20024 */ addiu $v0, $sp, 0x24
@ -124,16 +124,16 @@ glabel EndActorSpeech
/* 181D7C 8025349C 10400005 */ beqz $v0, .L802534B4
/* 181D80 802534A0 30620080 */ andi $v0, $v1, 0x80
/* 181D84 802534A4 0C03A6CC */ jal decrement_status_menu_disabled
/* 181D88 802534A8 00000000 */ nop
/* 181D88 802534A8 00000000 */ nop
/* 181D8C 802534AC 08094D47 */ j .L8025351C
/* 181D90 802534B0 24020001 */ addiu $v0, $zero, 1
.L802534B4:
/* 181D94 802534B4 10400005 */ beqz $v0, .L802534CC
/* 181D98 802534B8 00000000 */ nop
/* 181D98 802534B8 00000000 */ nop
/* 181D9C 802534BC 3C06802A */ lui $a2, %hi(gSpeakingActorTalkAnim)
/* 181DA0 802534C0 8CC6FA6C */ lw $a2, %lo(gSpeakingActorTalkAnim)($a2)
/* 181DA4 802534C4 08094D35 */ j .L802534D4
/* 181DA8 802534C8 00000000 */ nop
/* 181DA8 802534C8 00000000 */ nop
.L802534CC:
/* 181DAC 802534CC 3C06802A */ lui $a2, %hi(gSpeakingActorIdleAnim)
/* 181DB0 802534D0 8CC6FA70 */ lw $a2, %lo(gSpeakingActorIdleAnim)($a2)
@ -149,7 +149,7 @@ glabel EndActorSpeech
/* 181DD0 802534F0 1462000A */ bne $v1, $v0, .L8025351C
/* 181DD4 802534F4 0000102D */ daddu $v0, $zero, $zero
/* 181DD8 802534F8 0C03A6CC */ jal decrement_status_menu_disabled
/* 181DDC 802534FC 00000000 */ nop
/* 181DDC 802534FC 00000000 */ nop
/* 181DE0 80253500 24020001 */ addiu $v0, $zero, 1
/* 181DE4 80253504 3C03800A */ lui $v1, %hi(D_8009A650)
/* 181DE8 80253508 2463A650 */ addiu $v1, $v1, %lo(D_8009A650)

2
asm/nonmatchings/code_197F40/SetActorIdleJumpGravity.s
View File

@ -16,7 +16,7 @@ glabel SetActorIdleJumpGravity
/* 199EE4 8026B604 0040802D */ daddu $s0, $v0, $zero
/* 199EE8 8026B608 2402FF81 */ addiu $v0, $zero, -0x7f
/* 199EEC 8026B60C 16020002 */ bne $s0, $v0, .L8026B618
/* 199EF0 8026B610 00000000 */ nop
/* 199EF0 8026B610 00000000 */ nop
/* 199EF4 8026B614 8E500148 */ lw $s0, 0x148($s2)
.L8026B618:
/* 199EF8 8026B618 8E250000 */ lw $a1, ($s1)

2
asm/nonmatchings/code_197F40/SetActorIdleSpeed.s
View File

@ -16,7 +16,7 @@ glabel SetActorIdleSpeed
/* 199FDC 8026B6FC 0040802D */ daddu $s0, $v0, $zero
/* 199FE0 8026B700 2402FF81 */ addiu $v0, $zero, -0x7f
/* 199FE4 8026B704 16020002 */ bne $s0, $v0, .L8026B710
/* 199FE8 8026B708 00000000 */ nop
/* 199FE8 8026B708 00000000 */ nop
/* 199FEC 8026B70C 8E500148 */ lw $s0, 0x148($s2)
.L8026B710:
/* 199FF0 8026B710 8E250000 */ lw $a1, ($s1)

8
asm/nonmatchings/code_759b0_len_61b0/func_800E06D8.s
View File

@ -17,8 +17,8 @@ glabel func_800E06D8
/* 79BB8 800E0708 82220015 */ lb $v0, 0x15($s1)
/* 79BBC 800E070C 1440003C */ bnez $v0, .L800E0800
/* 79BC0 800E0710 0000102D */ daddu $v0, $zero, $zero
/* 79BC4 800E0714 3C028016 */ lui $v0, 0x8016
/* 79BC8 800E0718 8442A562 */ lh $v0, -0x5a9e($v0)
/* 79BC4 800E0714 3C028016 */ lui $v0, %hi(gCollisionStatus+0x12)
/* 79BC8 800E0718 8442A562 */ lh $v0, %lo(gCollisionStatus+0x12)($v0)
/* 79BCC 800E071C 2405FFFF */ addiu $a1, $zero, -1
/* 79BD0 800E0720 14450003 */ bne $v0, $a1, .L800E0730
/* 79BD4 800E0724 3C020200 */ lui $v0, 0x200
@ -41,8 +41,8 @@ glabel func_800E06D8
/* 79C10 800E0760 080381FF */ j .L800E07FC
/* 79C14 800E0764 A62500C6 */ sh $a1, 0xc6($s1)
.L800E0768:
/* 79C18 800E0768 3C108016 */ lui $s0, 0x8016
/* 79C1C 800E076C 8610A562 */ lh $s0, -0x5a9e($s0)
/* 79C18 800E0768 3C108016 */ lui $s0, %hi(gCollisionStatus+0x12)
/* 79C1C 800E076C 8610A562 */ lh $s0, %lo(gCollisionStatus+0x12)($s0)
/* 79C20 800E0770 32024000 */ andi $v0, $s0, 0x4000
/* 79C24 800E0774 14400007 */ bnez $v0, .L800E0794
/* 79C28 800E0778 00000000 */ nop

4
asm/nonmatchings/code_759b0_len_61b0/update_player_shadow.s
View File

@ -104,8 +104,8 @@ glabel update_player_shadow
/* 7B1FC 800E1D4C AFA20024 */ sw $v0, 0x24($sp)
/* 7B200 800E1D50 C7A00038 */ lwc1 $f0, 0x38($sp)
/* 7B204 800E1D54 C7A2003C */ lwc1 $f2, 0x3c($sp)
/* 7B208 800E1D58 3C018016 */ lui $at, 0x8016
/* 7B20C 800E1D5C A422A556 */ sh $v0, -0x5aaa($at)
/* 7B208 800E1D58 3C018016 */ lui $at, %hi(gCollisionStatus+0x6)
/* 7B20C 800E1D5C A422A556 */ sh $v0, %lo(gCollisionStatus+0x6)($at)
/* 7B210 800E1D60 E6000028 */ swc1 $f0, 0x28($s0)
/* 7B214 800E1D64 E6020030 */ swc1 $f2, 0x30($s0)
/* 7B218 800E1D68 C62C006C */ lwc1 $f12, 0x6c($s1)

4
asm/nonmatchings/code_7bb60_len_41b0/func_800E5098.s
View File

@ -22,8 +22,8 @@ glabel func_800E5098
/* 7E584 800E50D4 00001810 */ mfhi $v1
/* 7E588 800E50D8 14600019 */ bnez $v1, .L800E5140
/* 7E58C 800E50DC 00000000 */ nop
/* 7E590 800E50E0 3C048016 */ lui $a0, 0x8016
/* 7E594 800E50E4 8484A552 */ lh $a0, -0x5aae($a0)
/* 7E590 800E50E0 3C048016 */ lui $a0, %hi(gCollisionStatus+0x2)
/* 7E594 800E50E4 8484A552 */ lh $a0, %lo(gCollisionStatus+0x2)($a0)
/* 7E598 800E50E8 0C016F6A */ jal get_collider_type_by_id
/* 7E59C 800E50EC 00000000 */ nop
/* 7E5A0 800E50F0 304300FF */ andi $v1, $v0, 0xff

4
asm/nonmatchings/code_7bb60_len_41b0/func_800E5150.s
View File

@ -7,7 +7,7 @@ glabel func_800E5150
/* 7E608 800E5158 0C03945D */ jal func_800E5174
/* 7E60C 800E515C 00000000 */ nop
/* 7E610 800E5160 8FBF0010 */ lw $ra, 0x10($sp)
/* 7E614 800E5164 3C018016 */ lui $at, 0x8016
/* 7E618 800E5168 A422A55A */ sh $v0, -0x5aa6($at)
/* 7E614 800E5164 3C018016 */ lui $at, %hi(gCollisionStatus+0xA)
/* 7E618 800E5168 A422A55A */ sh $v0, %lo(gCollisionStatus+0xA)($at)
/* 7E61C 800E516C 03E00008 */ jr $ra
/* 7E620 800E5170 27BD0018 */ addiu $sp, $sp, 0x18

4
asm/nonmatchings/code_7bb60_len_41b0/func_800E5530.s
View File

@ -214,8 +214,8 @@ glabel func_800E5530
.L800E5844:
/* 7ECF4 800E5844 16020014 */ bne $s0, $v0, .L800E5898
/* 7ECF8 800E5848 00000000 */ nop
/* 7ECFC 800E584C 3C048016 */ lui $a0, 0x8016
/* 7ED00 800E5850 8484A552 */ lh $a0, -0x5aae($a0)
/* 7ECFC 800E584C 3C048016 */ lui $a0, %hi(gCollisionStatus+0x2)
/* 7ED00 800E5850 8484A552 */ lh $a0, %lo(gCollisionStatus+0x2)($a0)
/* 7ED04 800E5854 0C016F6A */ jal get_collider_type_by_id
/* 7ED08 800E5858 00000000 */ nop
/* 7ED0C 800E585C 304200FF */ andi $v0, $v0, 0xff

4
asm/nonmatchings/code_891b0_len_fb0/func_800EFD08.s
View File

@ -16,8 +16,8 @@ glabel func_800EFD08
/* 891E4 800EFD34 3C108011 */ lui $s0, 0x8011
/* 891E8 800EFD38 8E109480 */ lw $s0, -0x6b80($s0)
.L800EFD3C:
/* 891EC 800EFD3C 3C048016 */ lui $a0, 0x8016
/* 891F0 800EFD40 9484A552 */ lhu $a0, -0x5aae($a0)
/* 891EC 800EFD3C 3C048016 */ lui $a0, %hi(gCollisionStatus+0x2)
/* 891F0 800EFD40 9484A552 */ lhu $a0, %lo(gCollisionStatus+0x2)($a0)
/* 891F4 800EFD44 0C016F6A */ jal get_collider_type_by_id
/* 891F8 800EFD48 00000000 */ nop
/* 891FC 800EFD4C 822300B4 */ lb $v1, 0xb4($s1)

4
asm/nonmatchings/code_F5750/func_802D244C.s
View File

@ -2,8 +2,8 @@
.set noreorder # don't insert nops after branches
glabel func_802D244C
/* F6DFC 802D244C 3C028016 */ lui $v0, 0x8016
/* F6E00 802D2450 8442A552 */ lh $v0, -0x5aae($v0)
/* F6DFC 802D244C 3C028016 */ lui $v0, %hi(gCollisionStatus+0x2)
/* F6E00 802D2450 8442A552 */ lh $v0, %lo(gCollisionStatus+0x2)($v0)
/* F6E04 802D2454 27BDFFE8 */ addiu $sp, $sp, -0x18
/* F6E08 802D2458 04400006 */ bltz $v0, .L802D2474
/* F6E0C 802D245C AFBF0010 */ sw $ra, 0x10($sp)

4
asm/nonmatchings/code_F5750/func_802D2484.s
View File

@ -2,8 +2,8 @@
.set noreorder # don't insert nops after branches
glabel func_802D2484
/* F6E34 802D2484 3C028016 */ lui $v0, 0x8016
/* F6E38 802D2488 8442A552 */ lh $v0, -0x5aae($v0)
/* F6E34 802D2484 3C028016 */ lui $v0, %hi(gCollisionStatus+0x2)
/* F6E38 802D2488 8442A552 */ lh $v0, %lo(gCollisionStatus+0x2)($v0)
/* F6E3C 802D248C 00021027 */ nor $v0, $zero, $v0
/* F6E40 802D2490 000217C3 */ sra $v0, $v0, 0x1f
/* F6E44 802D2494 03E00008 */ jr $ra

20
asm/nonmatchings/code_a5dd0_len_114e0/entity_get_collision_flags.s
View File

@ -14,8 +14,8 @@ glabel entity_get_collision_flags
/* A6FDC 801108DC 00621024 */ and $v0, $v1, $v0
/* A6FE0 801108E0 AC820000 */ sw $v0, ($a0)
.L801108E4:
/* A6FE4 801108E4 3C038016 */ lui $v1, 0x8016
/* A6FE8 801108E8 8463A552 */ lh $v1, -0x5aae($v1)
/* A6FE4 801108E4 3C038016 */ lui $v1, %hi(gCollisionStatus+0x2)
/* A6FE8 801108E8 8463A552 */ lh $v1, %lo(gCollisionStatus+0x2)($v1)
/* A6FEC 801108EC 2402FFFF */ addiu $v0, $zero, -1
/* A6FF0 801108F0 10620005 */ beq $v1, $v0, .L80110908
/* A6FF4 801108F4 30624000 */ andi $v0, $v1, 0x4000
@ -24,8 +24,8 @@ glabel entity_get_collision_flags
/* A7000 80110900 50C20001 */ beql $a2, $v0, .L80110908
/* A7004 80110904 34A50001 */ ori $a1, $a1, 1
.L80110908:
/* A7008 80110908 3C038016 */ lui $v1, 0x8016
/* A700C 8011090C 8463A554 */ lh $v1, -0x5aac($v1)
/* A7008 80110908 3C038016 */ lui $v1, %hi(gCollisionStatus+0x4)
/* A700C 8011090C 8463A554 */ lh $v1, %lo(gCollisionStatus+0x4)($v1)
/* A7010 80110910 2402FFFF */ addiu $v0, $zero, -1
/* A7014 80110914 10620005 */ beq $v1, $v0, .L8011092C
/* A7018 80110918 30624000 */ andi $v0, $v1, 0x4000
@ -34,8 +34,8 @@ glabel entity_get_collision_flags
/* A7024 80110924 50C20001 */ beql $a2, $v0, .L8011092C
/* A7028 80110928 34A50100 */ ori $a1, $a1, 0x100
.L8011092C:
/* A702C 8011092C 3C038016 */ lui $v1, 0x8016
/* A7030 80110930 8463A558 */ lh $v1, -0x5aa8($v1)
/* A702C 8011092C 3C038016 */ lui $v1, %hi(gCollisionStatus+0x8)
/* A7030 80110930 8463A558 */ lh $v1, %lo(gCollisionStatus+0x8)($v1)
/* A7034 80110934 2402FFFF */ addiu $v0, $zero, -1
/* A7038 80110938 10620005 */ beq $v1, $v0, .L80110950
/* A703C 8011093C 30624000 */ andi $v0, $v1, 0x4000
@ -54,8 +54,8 @@ glabel entity_get_collision_flags
/* A706C 8011096C 50C20001 */ beql $a2, $v0, .L80110974
/* A7070 80110970 34A50010 */ ori $a1, $a1, 0x10
.L80110974:
/* A7074 80110974 3C038016 */ lui $v1, 0x8016
/* A7078 80110978 8463A564 */ lh $v1, -0x5a9c($v1)
/* A7074 80110974 3C038016 */ lui $v1, %hi(gCollisionStatus+0x14)
/* A7078 80110978 8463A564 */ lh $v1, %lo(gCollisionStatus+0x14)($v1)
/* A707C 8011097C 2402FFFF */ addiu $v0, $zero, -1
/* A7080 80110980 10620005 */ beq $v1, $v0, .L80110998
/* A7084 80110984 30624000 */ andi $v0, $v1, 0x4000
@ -64,8 +64,8 @@ glabel entity_get_collision_flags
/* A7090 80110990 50C20001 */ beql $a2, $v0, .L80110998
/* A7094 80110994 34A50040 */ ori $a1, $a1, 0x40
.L80110998:
/* A7098 80110998 3C038016 */ lui $v1, 0x8016
/* A709C 8011099C 8463A562 */ lh $v1, -0x5a9e($v1)
/* A7098 80110998 3C038016 */ lui $v1, %hi(gCollisionStatus+0x12)
/* A709C 8011099C 8463A562 */ lh $v1, %lo(gCollisionStatus+0x12)($v1)
/* A70A0 801109A0 2402FFFF */ addiu $v0, $zero, -1
/* A70A4 801109A4 1062000B */ beq $v1, $v0, .L801109D4
/* A70A8 801109A8 30624000 */ andi $v0, $v1, 0x4000