pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-08 12:02:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

add bActor structs to symbol_addrs

Browse Source
This commit is contained in:
Alex Bates 2021-02-10 17:30:27 +00:00
parent 26d8a19c32
commit 5ae51ccf33
13 changed files with 120 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/nonmatchings/battle/partner/goombario_6F10E0/func_80238B60_6F1C40.s generated
View File

@ -13,11 +13,11 @@ glabel func_80238B60_6F1C40
/* 6F1C60 80238B80 0040202D */ daddu $a0, $v0, $zero
/* 6F1C64 80238B84 90820136 */ lbu $v0, 0x136($a0)
/* 6F1C68 80238B88 00021080 */ sll $v0, $v0, 2
/* 6F1C6C 80238B8C 3C018028 */ lui $at, %hi(gActorTattles)
/* 6F1C6C 80238B8C 3C018028 */ lui $at, %hi(bActorTattles)
/* 6F1C70 80238B90 00220821 */ addu $at, $at, $v0
/* 6F1C74 80238B94 8C222B98 */ lw $v0, %lo(gActorTattles)($at)
/* 6F1C78 80238B98 3C038028 */ lui $v1, %hi(gActorTattles)
/* 6F1C7C 80238B9C 24632B98 */ addiu $v1, $v1, %lo(gActorTattles)
/* 6F1C74 80238B94 8C222B98 */ lw $v0, %lo(bActorTattles)($at)
/* 6F1C78 80238B98 3C038028 */ lui $v1, %hi(bActorTattles)
/* 6F1C7C 80238B9C 24632B98 */ addiu $v1, $v1, %lo(bActorTattles)
/* 6F1C80 80238BA0 14400003 */ bnez $v0, .L80238BB0
/* 6F1C84 80238BA4 AE020084 */ sw $v0, 0x84($s0)
/* 6F1C88 80238BA8 8C620000 */ lw $v0, ($v1)

4
asm/nonmatchings/battle/partner/goombario_6F10E0/func_80238BCC_6F1CAC.s generated
View File

@ -121,9 +121,9 @@ glabel func_80238BCC_6F1CAC
/* 6F1E6C 80238D8C AE020090 */ sw $v0, 0x90($s0)
/* 6F1E70 80238D90 90820136 */ lbu $v0, 0x136($a0)
/* 6F1E74 80238D94 00021080 */ sll $v0, $v0, 2
/* 6F1E78 80238D98 3C038028 */ lui $v1, %hi(gActorCamOffsets)
/* 6F1E78 80238D98 3C038028 */ lui $v1, %hi(bActorCamOffsets)
/* 6F1E7C 80238D9C 00621821 */ addu $v1, $v1, $v0
/* 6F1E80 80238DA0 80632EE8 */ lb $v1, %lo(gActorCamOffsets)($v1)
/* 6F1E80 80238DA0 80632EE8 */ lb $v1, %lo(bActorCamOffsets)($v1)
/* 6F1E84 80238DA4 8E020084 */ lw $v0, 0x84($s0)
/* 6F1E88 80238DA8 00431021 */ addu $v0, $v0, $v1
/* 6F1E8C 80238DAC AE020084 */ sw $v0, 0x84($s0)

4
asm/nonmatchings/code_182B30/update_actor_shadow.s generated
View File

@ -347,9 +347,9 @@ glabel update_actor_shadow
/* 1847A0 80255EC0 E6220014 */ swc1 $f2, 0x14($s1)
/* 1847A4 80255EC4 92420136 */ lbu $v0, 0x136($s2)
/* 1847A8 80255EC8 00021080 */ sll $v0, $v0, 2
/* 1847AC 80255ECC 3C018028 */ lui $at, %hi(gActorCamOffsets+3)
/* 1847AC 80255ECC 3C018028 */ lui $at, %hi(bActorCamOffsets+3)
/* 1847B0 80255ED0 00220821 */ addu $at, $at, $v0
/* 1847B4 80255ED4 80222EEB */ lb $v0, %lo(gActorCamOffsets+3)($at)
/* 1847B4 80255ED4 80222EEB */ lb $v0, %lo(bActorCamOffsets+3)($at)
/* 1847B8 80255ED8 C7A00020 */ lwc1 $f0, 0x20($sp)
/* 1847BC 80255EDC 44821000 */ mtc1 $v0, $f2
/* 1847C0 80255EE0 00000000 */ nop

36
asm/nonmatchings/code_190B20/create_actor.s generated
View File

@ -206,59 +206,59 @@ glabel create_actor
/* 193F8C 802656AC 000310C0 */ sll $v0, $v1, 3
/* 193F90 802656B0 00431023 */ subu $v0, $v0, $v1
/* 193F94 802656B4 00021080 */ sll $v0, $v0, 2
/* 193F98 802656B8 3C018028 */ lui $at, %hi(gActorSoundTable)
/* 193F98 802656B8 3C018028 */ lui $at, %hi(bActorSoundTable)
/* 193F9C 802656BC 00220821 */ addu $at, $at, $v0
/* 193FA0 802656C0 8C221468 */ lw $v0, %lo(gActorSoundTable)($at)
/* 193FA0 802656C0 8C221468 */ lw $v0, %lo(bActorSoundTable)($at)
/* 193FA4 802656C4 AE22019C */ sw $v0, 0x19c($s1)
/* 193FA8 802656C8 000310C0 */ sll $v0, $v1, 3
/* 193FAC 802656CC 00431023 */ subu $v0, $v0, $v1
/* 193FB0 802656D0 00021080 */ sll $v0, $v0, 2
/* 193FB4 802656D4 3C018028 */ lui $at, %hi(gActorSoundTable+4)
/* 193FB4 802656D4 3C018028 */ lui $at, %hi(bActorSoundTable+4)
/* 193FB8 802656D8 00220821 */ addu $at, $at, $v0
/* 193FBC 802656DC 8C22146C */ lw $v0, %lo(gActorSoundTable+4)($at)
/* 193FBC 802656DC 8C22146C */ lw $v0, %lo(bActorSoundTable+4)($at)
/* 193FC0 802656E0 AE2201A0 */ sw $v0, 0x1a0($s1)
/* 193FC4 802656E4 000310C0 */ sll $v0, $v1, 3
/* 193FC8 802656E8 00431023 */ subu $v0, $v0, $v1
/* 193FCC 802656EC 00021080 */ sll $v0, $v0, 2
/* 193FD0 802656F0 3C018028 */ lui $at, %hi(gActorSoundTable+8)
/* 193FD0 802656F0 3C018028 */ lui $at, %hi(bActorSoundTable+8)
/* 193FD4 802656F4 00220821 */ addu $at, $at, $v0
/* 193FD8 802656F8 8C221470 */ lw $v0, %lo(gActorSoundTable+8)($at)
/* 193FD8 802656F8 8C221470 */ lw $v0, %lo(bActorSoundTable+8)($at)
/* 193FDC 802656FC AE2201A4 */ sw $v0, 0x1a4($s1)
/* 193FE0 80265700 000310C0 */ sll $v0, $v1, 3
/* 193FE4 80265704 00431023 */ subu $v0, $v0, $v1
/* 193FE8 80265708 00021080 */ sll $v0, $v0, 2
/* 193FEC 8026570C 3C018028 */ lui $at, %hi(gActorSoundTable+12)
/* 193FEC 8026570C 3C018028 */ lui $at, %hi(bActorSoundTable+12)
/* 193FF0 80265710 00220821 */ addu $at, $at, $v0
/* 193FF4 80265714 8C221474 */ lw $v0, %lo(gActorSoundTable+12)($at)
/* 193FF4 80265714 8C221474 */ lw $v0, %lo(bActorSoundTable+12)($at)
/* 193FF8 80265718 AE2201A8 */ sw $v0, 0x1a8($s1)
/* 193FFC 8026571C 000310C0 */ sll $v0, $v1, 3
/* 194000 80265720 00431023 */ subu $v0, $v0, $v1
/* 194004 80265724 00021080 */ sll $v0, $v0, 2
/* 194008 80265728 3C018028 */ lui $at, %hi(gActorSoundTable+16)
/* 194008 80265728 3C018028 */ lui $at, %hi(bActorSoundTable+16)
/* 19400C 8026572C 00220821 */ addu $at, $at, $v0
/* 194010 80265730 8C221478 */ lw $v0, %lo(gActorSoundTable+16)($at)
/* 194010 80265730 8C221478 */ lw $v0, %lo(bActorSoundTable+16)($at)
/* 194014 80265734 AE2201AC */ sw $v0, 0x1ac($s1)
/* 194018 80265738 000310C0 */ sll $v0, $v1, 3
/* 19401C 8026573C 00431023 */ subu $v0, $v0, $v1
/* 194020 80265740 00021080 */ sll $v0, $v0, 2
/* 194024 80265744 3C018028 */ lui $at, %hi(gActorSoundTable+20)
/* 194024 80265744 3C018028 */ lui $at, %hi(bActorSoundTable+20)
/* 194028 80265748 00220821 */ addu $at, $at, $v0
/* 19402C 8026574C 8C22147C */ lw $v0, %lo(gActorSoundTable+20)($at)
/* 19402C 8026574C 8C22147C */ lw $v0, %lo(bActorSoundTable+20)($at)
/* 194030 80265750 AE2201B0 */ sw $v0, 0x1b0($s1)
/* 194034 80265754 000310C0 */ sll $v0, $v1, 3
/* 194038 80265758 00431023 */ subu $v0, $v0, $v1
/* 19403C 8026575C 00021080 */ sll $v0, $v0, 2
/* 194040 80265760 3C018028 */ lui $at, %hi(gActorSoundTable+24)
/* 194040 80265760 3C018028 */ lui $at, %hi(bActorSoundTable+24)
/* 194044 80265764 00220821 */ addu $at, $at, $v0
/* 194048 80265768 94221480 */ lhu $v0, %lo(gActorSoundTable+24)($at)
/* 194048 80265768 94221480 */ lhu $v0, %lo(bActorSoundTable+24)($at)
/* 19404C 8026576C 24100001 */ addiu $s0, $zero, 1
/* 194050 80265770 A62201B4 */ sh $v0, 0x1b4($s1)
/* 194054 80265774 000310C0 */ sll $v0, $v1, 3
/* 194058 80265778 00431023 */ subu $v0, $v0, $v1
/* 19405C 8026577C 00021080 */ sll $v0, $v0, 2
/* 194060 80265780 3C018028 */ lui $at, %hi(gActorSoundTable+0x1A)
/* 194060 80265780 3C018028 */ lui $at, %hi(bActorSoundTable+0x1A)
/* 194064 80265784 00220821 */ addu $at, $at, $v0
/* 194068 80265788 94221482 */ lhu $v0, %lo(gActorSoundTable+0x1A)($at)
/* 194068 80265788 94221482 */ lhu $v0, %lo(bActorSoundTable+0x1A)($at)
/* 19406C 8026578C 26230004 */ addiu $v1, $s1, 4
/* 194070 80265790 A62201B6 */ sh $v0, 0x1b6($s1)
.L80265794:
@ -290,8 +290,8 @@ glabel create_actor
/* 1940D0 802657F0 0000982D */ daddu $s3, $zero, $zero
/* 1940D4 802657F4 3C013F80 */ lui $at, 0x3f80
/* 1940D8 802657F8 4481A000 */ mtc1 $at, $f20
/* 1940DC 802657FC 3C128028 */ lui $s2, %hi(gActorSoundTable)
/* 1940E0 80265800 26521468 */ addiu $s2, $s2, %lo(gActorSoundTable)
/* 1940DC 802657FC 3C128028 */ lui $s2, %hi(bActorSoundTable)
/* 1940E0 80265800 26521468 */ addiu $s2, $s2, %lo(bActorSoundTable)
/* 1940E4 80265804 0260A82D */ daddu $s5, $s3, $zero
.L80265808:
/* 1940E8 80265808 8E82000C */ lw $v0, 0xc($s4)

36
asm/nonmatchings/code_190B20/load_partner_actor.s generated
View File

@ -188,59 +188,59 @@ glabel load_partner_actor
/* 193714 80264E34 000310C0 */ sll $v0, $v1, 3
/* 193718 80264E38 00431023 */ subu $v0, $v0, $v1
/* 19371C 80264E3C 00021080 */ sll $v0, $v0, 2
/* 193720 80264E40 3C018028 */ lui $at, %hi(gActorSoundTable)
/* 193720 80264E40 3C018028 */ lui $at, %hi(bActorSoundTable)
/* 193724 80264E44 00220821 */ addu $at, $at, $v0
/* 193728 80264E48 8C221468 */ lw $v0, %lo(gActorSoundTable)($at)
/* 193728 80264E48 8C221468 */ lw $v0, %lo(bActorSoundTable)($at)
/* 19372C 80264E4C AE22019C */ sw $v0, 0x19c($s1)
/* 193730 80264E50 000310C0 */ sll $v0, $v1, 3
/* 193734 80264E54 00431023 */ subu $v0, $v0, $v1
/* 193738 80264E58 00021080 */ sll $v0, $v0, 2
/* 19373C 80264E5C 3C018028 */ lui $at, %hi(gActorSoundTable+4)
/* 19373C 80264E5C 3C018028 */ lui $at, %hi(bActorSoundTable+4)
/* 193740 80264E60 00220821 */ addu $at, $at, $v0
/* 193744 80264E64 8C22146C */ lw $v0, %lo(gActorSoundTable+4)($at)
/* 193744 80264E64 8C22146C */ lw $v0, %lo(bActorSoundTable+4)($at)
/* 193748 80264E68 AE2201A0 */ sw $v0, 0x1a0($s1)
/* 19374C 80264E6C 000310C0 */ sll $v0, $v1, 3
/* 193750 80264E70 00431023 */ subu $v0, $v0, $v1
/* 193754 80264E74 00021080 */ sll $v0, $v0, 2
/* 193758 80264E78 3C018028 */ lui $at, %hi(gActorSoundTable+8)
/* 193758 80264E78 3C018028 */ lui $at, %hi(bActorSoundTable+8)
/* 19375C 80264E7C 00220821 */ addu $at, $at, $v0
/* 193760 80264E80 8C221470 */ lw $v0, %lo(gActorSoundTable+8)($at)
/* 193760 80264E80 8C221470 */ lw $v0, %lo(bActorSoundTable+8)($at)
/* 193764 80264E84 AE2201A4 */ sw $v0, 0x1a4($s1)
/* 193768 80264E88 000310C0 */ sll $v0, $v1, 3
/* 19376C 80264E8C 00431023 */ subu $v0, $v0, $v1
/* 193770 80264E90 00021080 */ sll $v0, $v0, 2
/* 193774 80264E94 3C018028 */ lui $at, %hi(gActorSoundTable+12)
/* 193774 80264E94 3C018028 */ lui $at, %hi(bActorSoundTable+12)
/* 193778 80264E98 00220821 */ addu $at, $at, $v0
/* 19377C 80264E9C 8C221474 */ lw $v0, %lo(gActorSoundTable+12)($at)
/* 19377C 80264E9C 8C221474 */ lw $v0, %lo(bActorSoundTable+12)($at)
/* 193780 80264EA0 AE2201A8 */ sw $v0, 0x1a8($s1)
/* 193784 80264EA4 000310C0 */ sll $v0, $v1, 3
/* 193788 80264EA8 00431023 */ subu $v0, $v0, $v1
/* 19378C 80264EAC 00021080 */ sll $v0, $v0, 2
/* 193790 80264EB0 3C018028 */ lui $at, %hi(gActorSoundTable+16)
/* 193790 80264EB0 3C018028 */ lui $at, %hi(bActorSoundTable+16)
/* 193794 80264EB4 00220821 */ addu $at, $at, $v0
/* 193798 80264EB8 8C221478 */ lw $v0, %lo(gActorSoundTable+16)($at)
/* 193798 80264EB8 8C221478 */ lw $v0, %lo(bActorSoundTable+16)($at)
/* 19379C 80264EBC AE2201AC */ sw $v0, 0x1ac($s1)
/* 1937A0 80264EC0 000310C0 */ sll $v0, $v1, 3
/* 1937A4 80264EC4 00431023 */ subu $v0, $v0, $v1
/* 1937A8 80264EC8 00021080 */ sll $v0, $v0, 2
/* 1937AC 80264ECC 3C018028 */ lui $at, %hi(gActorSoundTable+20)
/* 1937AC 80264ECC 3C018028 */ lui $at, %hi(bActorSoundTable+20)
/* 1937B0 80264ED0 00220821 */ addu $at, $at, $v0
/* 1937B4 80264ED4 8C22147C */ lw $v0, %lo(gActorSoundTable+20)($at)
/* 1937B4 80264ED4 8C22147C */ lw $v0, %lo(bActorSoundTable+20)($at)
/* 1937B8 80264ED8 AE2201B0 */ sw $v0, 0x1b0($s1)
/* 1937BC 80264EDC 000310C0 */ sll $v0, $v1, 3
/* 1937C0 80264EE0 00431023 */ subu $v0, $v0, $v1
/* 1937C4 80264EE4 00021080 */ sll $v0, $v0, 2
/* 1937C8 80264EE8 3C018028 */ lui $at, %hi(gActorSoundTable+24)
/* 1937C8 80264EE8 3C018028 */ lui $at, %hi(bActorSoundTable+24)
/* 1937CC 80264EEC 00220821 */ addu $at, $at, $v0
/* 1937D0 80264EF0 94221480 */ lhu $v0, %lo(gActorSoundTable+24)($at)
/* 1937D0 80264EF0 94221480 */ lhu $v0, %lo(bActorSoundTable+24)($at)
/* 1937D4 80264EF4 24040001 */ addiu $a0, $zero, 1
/* 1937D8 80264EF8 A62201B4 */ sh $v0, 0x1b4($s1)
/* 1937DC 80264EFC 000310C0 */ sll $v0, $v1, 3
/* 1937E0 80264F00 00431023 */ subu $v0, $v0, $v1
/* 1937E4 80264F04 00021080 */ sll $v0, $v0, 2
/* 1937E8 80264F08 3C018028 */ lui $at, %hi(gActorSoundTable+0x1A)
/* 1937E8 80264F08 3C018028 */ lui $at, %hi(bActorSoundTable+0x1A)
/* 1937EC 80264F0C 00220821 */ addu $at, $at, $v0
/* 1937F0 80264F10 94221482 */ lhu $v0, %lo(gActorSoundTable+0x1A)($at)
/* 1937F0 80264F10 94221482 */ lhu $v0, %lo(bActorSoundTable+0x1A)($at)
/* 1937F4 80264F14 26230004 */ addiu $v1, $s1, 4
/* 1937F8 80264F18 A62201B6 */ sh $v0, 0x1b6($s1)
.L80264F1C:
@ -261,8 +261,8 @@ glabel load_partner_actor
/* 19382C 80264F4C 0000982D */ daddu $s3, $zero, $zero
/* 193830 80264F50 3C013F80 */ lui $at, 0x3f80
/* 193834 80264F54 4481A000 */ mtc1 $at, $f20
/* 193838 80264F58 3C128028 */ lui $s2, %hi(gActorSoundTable)
/* 19383C 80264F5C 26521468 */ addiu $s2, $s2, %lo(gActorSoundTable)
/* 193838 80264F58 3C128028 */ lui $s2, %hi(bActorSoundTable)
/* 19383C 80264F5C 26521468 */ addiu $s2, $s2, %lo(bActorSoundTable)
/* 193840 80264F60 0260A82D */ daddu $s5, $s3, $zero
.L80264F64:
/* 193844 80264F64 8E83000C */ lw $v1, 0xc($s4)

64
asm/nonmatchings/code_190B20/load_player_actor.s generated
View File

@ -146,59 +146,59 @@ glabel load_player_actor
/* 192FA4 802646C4 000310C0 */ sll $v0, $v1, 3
/* 192FA8 802646C8 00431023 */ subu $v0, $v0, $v1
/* 192FAC 802646CC 00021080 */ sll $v0, $v0, 2
/* 192FB0 802646D0 3C018028 */ lui $at, %hi(gActorSoundTable)
/* 192FB0 802646D0 3C018028 */ lui $at, %hi(bActorSoundTable)
/* 192FB4 802646D4 00220821 */ addu $at, $at, $v0
/* 192FB8 802646D8 8C221468 */ lw $v0, %lo(gActorSoundTable)($at)
/* 192FB8 802646D8 8C221468 */ lw $v0, %lo(bActorSoundTable)($at)
/* 192FBC 802646DC AE02019C */ sw $v0, 0x19c($s0)
/* 192FC0 802646E0 000310C0 */ sll $v0, $v1, 3
/* 192FC4 802646E4 00431023 */ subu $v0, $v0, $v1
/* 192FC8 802646E8 00021080 */ sll $v0, $v0, 2
/* 192FCC 802646EC 3C018028 */ lui $at, %hi(gActorSoundTable+4)
/* 192FCC 802646EC 3C018028 */ lui $at, %hi(bActorSoundTable+4)
/* 192FD0 802646F0 00220821 */ addu $at, $at, $v0
/* 192FD4 802646F4 8C22146C */ lw $v0, %lo(gActorSoundTable+4)($at)
/* 192FD4 802646F4 8C22146C */ lw $v0, %lo(bActorSoundTable+4)($at)
/* 192FD8 802646F8 AE0201A0 */ sw $v0, 0x1a0($s0)
/* 192FDC 802646FC 000310C0 */ sll $v0, $v1, 3
/* 192FE0 80264700 00431023 */ subu $v0, $v0, $v1
/* 192FE4 80264704 00021080 */ sll $v0, $v0, 2
/* 192FE8 80264708 3C018028 */ lui $at, %hi(gActorSoundTable+8)
/* 192FE8 80264708 3C018028 */ lui $at, %hi(bActorSoundTable+8)
/* 192FEC 8026470C 00220821 */ addu $at, $at, $v0
/* 192FF0 80264710 8C221470 */ lw $v0, %lo(gActorSoundTable+8)($at)
/* 192FF0 80264710 8C221470 */ lw $v0, %lo(bActorSoundTable+8)($at)
/* 192FF4 80264714 AE0201A4 */ sw $v0, 0x1a4($s0)
/* 192FF8 80264718 000310C0 */ sll $v0, $v1, 3
/* 192FFC 8026471C 00431023 */ subu $v0, $v0, $v1
/* 193000 80264720 00021080 */ sll $v0, $v0, 2
/* 193004 80264724 3C018028 */ lui $at, %hi(gActorSoundTable+12)
/* 193004 80264724 3C018028 */ lui $at, %hi(bActorSoundTable+12)
/* 193008 80264728 00220821 */ addu $at, $at, $v0
/* 19300C 8026472C 8C221474 */ lw $v0, %lo(gActorSoundTable+12)($at)
/* 19300C 8026472C 8C221474 */ lw $v0, %lo(bActorSoundTable+12)($at)
/* 193010 80264730 AE0201A8 */ sw $v0, 0x1a8($s0)
/* 193014 80264734 000310C0 */ sll $v0, $v1, 3
/* 193018 80264738 00431023 */ subu $v0, $v0, $v1
/* 19301C 8026473C 00021080 */ sll $v0, $v0, 2
/* 193020 80264740 3C018028 */ lui $at, %hi(gActorSoundTable+16)
/* 193020 80264740 3C018028 */ lui $at, %hi(bActorSoundTable+16)
/* 193024 80264744 00220821 */ addu $at, $at, $v0
/* 193028 80264748 8C221478 */ lw $v0, %lo(gActorSoundTable+16)($at)
/* 193028 80264748 8C221478 */ lw $v0, %lo(bActorSoundTable+16)($at)
/* 19302C 8026474C AE0201AC */ sw $v0, 0x1ac($s0)
/* 193030 80264750 000310C0 */ sll $v0, $v1, 3
/* 193034 80264754 00431023 */ subu $v0, $v0, $v1
/* 193038 80264758 00021080 */ sll $v0, $v0, 2
/* 19303C 8026475C 3C018028 */ lui $at, %hi(gActorSoundTable+20)
/* 19303C 8026475C 3C018028 */ lui $at, %hi(bActorSoundTable+20)
/* 193040 80264760 00220821 */ addu $at, $at, $v0
/* 193044 80264764 8C22147C */ lw $v0, %lo(gActorSoundTable+20)($at)
/* 193044 80264764 8C22147C */ lw $v0, %lo(bActorSoundTable+20)($at)
/* 193048 80264768 AE0201B0 */ sw $v0, 0x1b0($s0)
/* 19304C 8026476C 000310C0 */ sll $v0, $v1, 3
/* 193050 80264770 00431023 */ subu $v0, $v0, $v1
/* 193054 80264774 00021080 */ sll $v0, $v0, 2
/* 193058 80264778 3C018028 */ lui $at, %hi(gActorSoundTable+24)
/* 193058 80264778 3C018028 */ lui $at, %hi(bActorSoundTable+24)
/* 19305C 8026477C 00220821 */ addu $at, $at, $v0
/* 193060 80264780 94221480 */ lhu $v0, %lo(gActorSoundTable+24)($at)
/* 193060 80264780 94221480 */ lhu $v0, %lo(bActorSoundTable+24)($at)
/* 193064 80264784 24040001 */ addiu $a0, $zero, 1
/* 193068 80264788 A60201B4 */ sh $v0, 0x1b4($s0)
/* 19306C 8026478C 000310C0 */ sll $v0, $v1, 3
/* 193070 80264790 00431023 */ subu $v0, $v0, $v1
/* 193074 80264794 00021080 */ sll $v0, $v0, 2
/* 193078 80264798 3C018028 */ lui $at, %hi(gActorSoundTable+0x1A)
/* 193078 80264798 3C018028 */ lui $at, %hi(bActorSoundTable+0x1A)
/* 19307C 8026479C 00220821 */ addu $at, $at, $v0
/* 193080 802647A0 94221482 */ lhu $v0, %lo(gActorSoundTable+0x1A)($at)
/* 193080 802647A0 94221482 */ lhu $v0, %lo(bActorSoundTable+0x1A)($at)
/* 193084 802647A4 26030004 */ addiu $v1, $s0, 4
/* 193088 802647A8 A60201B6 */ sh $v0, 0x1b6($s0)
.L802647AC:
@ -295,65 +295,65 @@ glabel load_player_actor
/* 1931E4 80264904 000310C0 */ sll $v0, $v1, 3
/* 1931E8 80264908 00431023 */ subu $v0, $v0, $v1
/* 1931EC 8026490C 00021080 */ sll $v0, $v0, 2
/* 1931F0 80264910 3C018028 */ lui $at, %hi(gActorSoundTable)
/* 1931F0 80264910 3C018028 */ lui $at, %hi(bActorSoundTable)
/* 1931F4 80264914 00220821 */ addu $at, $at, $v0
/* 1931F8 80264918 8C221468 */ lw $v0, %lo(gActorSoundTable)($at)
/* 1931F8 80264918 8C221468 */ lw $v0, %lo(bActorSoundTable)($at)
/* 1931FC 8026491C AE2200A4 */ sw $v0, 0xa4($s1)
/* 193200 80264920 92030136 */ lbu $v1, 0x136($s0)
/* 193204 80264924 000310C0 */ sll $v0, $v1, 3
/* 193208 80264928 00431023 */ subu $v0, $v0, $v1
/* 19320C 8026492C 00021080 */ sll $v0, $v0, 2
/* 193210 80264930 3C018028 */ lui $at, %hi(gActorSoundTable+4)
/* 193210 80264930 3C018028 */ lui $at, %hi(bActorSoundTable+4)
/* 193214 80264934 00220821 */ addu $at, $at, $v0
/* 193218 80264938 8C22146C */ lw $v0, %lo(gActorSoundTable+4)($at)
/* 193218 80264938 8C22146C */ lw $v0, %lo(bActorSoundTable+4)($at)
/* 19321C 8026493C AE2200A8 */ sw $v0, 0xa8($s1)
/* 193220 80264940 92030136 */ lbu $v1, 0x136($s0)
/* 193224 80264944 000310C0 */ sll $v0, $v1, 3
/* 193228 80264948 00431023 */ subu $v0, $v0, $v1
/* 19322C 8026494C 00021080 */ sll $v0, $v0, 2
/* 193230 80264950 3C018028 */ lui $at, %hi(gActorSoundTable+8)
/* 193230 80264950 3C018028 */ lui $at, %hi(bActorSoundTable+8)
/* 193234 80264954 00220821 */ addu $at, $at, $v0
/* 193238 80264958 8C221470 */ lw $v0, %lo(gActorSoundTable+8)($at)
/* 193238 80264958 8C221470 */ lw $v0, %lo(bActorSoundTable+8)($at)
/* 19323C 8026495C AE2200AC */ sw $v0, 0xac($s1)
/* 193240 80264960 92030136 */ lbu $v1, 0x136($s0)
/* 193244 80264964 000310C0 */ sll $v0, $v1, 3
/* 193248 80264968 00431023 */ subu $v0, $v0, $v1
/* 19324C 8026496C 00021080 */ sll $v0, $v0, 2
/* 193250 80264970 3C018028 */ lui $at, %hi(gActorSoundTable+12)
/* 193250 80264970 3C018028 */ lui $at, %hi(bActorSoundTable+12)
/* 193254 80264974 00220821 */ addu $at, $at, $v0
/* 193258 80264978 8C221474 */ lw $v0, %lo(gActorSoundTable+12)($at)
/* 193258 80264978 8C221474 */ lw $v0, %lo(bActorSoundTable+12)($at)
/* 19325C 8026497C AE2200B0 */ sw $v0, 0xb0($s1)
/* 193260 80264980 92030136 */ lbu $v1, 0x136($s0)
/* 193264 80264984 000310C0 */ sll $v0, $v1, 3
/* 193268 80264988 00431023 */ subu $v0, $v0, $v1
/* 19326C 8026498C 00021080 */ sll $v0, $v0, 2
/* 193270 80264990 3C018028 */ lui $at, %hi(gActorSoundTable+16)
/* 193270 80264990 3C018028 */ lui $at, %hi(bActorSoundTable+16)
/* 193274 80264994 00220821 */ addu $at, $at, $v0
/* 193278 80264998 8C221478 */ lw $v0, %lo(gActorSoundTable+16)($at)
/* 193278 80264998 8C221478 */ lw $v0, %lo(bActorSoundTable+16)($at)
/* 19327C 8026499C AE2200B4 */ sw $v0, 0xb4($s1)
/* 193280 802649A0 92030136 */ lbu $v1, 0x136($s0)
/* 193284 802649A4 000310C0 */ sll $v0, $v1, 3
/* 193288 802649A8 00431023 */ subu $v0, $v0, $v1
/* 19328C 802649AC 00021080 */ sll $v0, $v0, 2
/* 193290 802649B0 3C018028 */ lui $at, %hi(gActorSoundTable+20)
/* 193290 802649B0 3C018028 */ lui $at, %hi(bActorSoundTable+20)
/* 193294 802649B4 00220821 */ addu $at, $at, $v0
/* 193298 802649B8 8C22147C */ lw $v0, %lo(gActorSoundTable+20)($at)
/* 193298 802649B8 8C22147C */ lw $v0, %lo(bActorSoundTable+20)($at)
/* 19329C 802649BC AE2200B8 */ sw $v0, 0xb8($s1)
/* 1932A0 802649C0 92030136 */ lbu $v1, 0x136($s0)
/* 1932A4 802649C4 000310C0 */ sll $v0, $v1, 3
/* 1932A8 802649C8 00431023 */ subu $v0, $v0, $v1
/* 1932AC 802649CC 00021080 */ sll $v0, $v0, 2
/* 1932B0 802649D0 3C018028 */ lui $at, %hi(gActorSoundTable+24)
/* 1932B0 802649D0 3C018028 */ lui $at, %hi(bActorSoundTable+24)
/* 1932B4 802649D4 00220821 */ addu $at, $at, $v0
/* 1932B8 802649D8 94221480 */ lhu $v0, %lo(gActorSoundTable+24)($at)
/* 1932B8 802649D8 94221480 */ lhu $v0, %lo(bActorSoundTable+24)($at)
/* 1932BC 802649DC A62200BC */ sh $v0, 0xbc($s1)
/* 1932C0 802649E0 92030136 */ lbu $v1, 0x136($s0)
/* 1932C4 802649E4 000310C0 */ sll $v0, $v1, 3
/* 1932C8 802649E8 00431023 */ subu $v0, $v0, $v1
/* 1932CC 802649EC 00021080 */ sll $v0, $v0, 2
/* 1932D0 802649F0 3C018028 */ lui $at, %hi(gActorSoundTable+0x1A)
/* 1932D0 802649F0 3C018028 */ lui $at, %hi(bActorSoundTable+0x1A)
/* 1932D4 802649F4 00220821 */ addu $at, $at, $v0
/* 1932D8 802649F8 94221482 */ lhu $v0, %lo(gActorSoundTable+0x1A)($at)
/* 1932D8 802649F8 94221482 */ lhu $v0, %lo(bActorSoundTable+0x1A)($at)
/* 1932DC 802649FC 8E230094 */ lw $v1, 0x94($s1)
/* 1932E0 80264A00 10600030 */ beqz $v1, .L80264AC4
/* 1932E4 80264A04 A62200BE */ sh $v0, 0xbe($s1)

32
asm/nonmatchings/code_190B20/reset_all_actor_sounds.s generated
View File

@ -7,58 +7,58 @@ glabel reset_all_actor_sounds
/* 196384 80267AA4 000310C0 */ sll $v0, $v1, 3
/* 196388 80267AA8 00431023 */ subu $v0, $v0, $v1
/* 19638C 80267AAC 00021080 */ sll $v0, $v0, 2
/* 196390 80267AB0 3C018028 */ lui $at, %hi(gActorSoundTable)
/* 196390 80267AB0 3C018028 */ lui $at, %hi(bActorSoundTable)
/* 196394 80267AB4 00220821 */ addu $at, $at, $v0
/* 196398 80267AB8 8C221468 */ lw $v0, %lo(gActorSoundTable)($at)
/* 196398 80267AB8 8C221468 */ lw $v0, %lo(bActorSoundTable)($at)
/* 19639C 80267ABC AC82019C */ sw $v0, 0x19c($a0)
/* 1963A0 80267AC0 000310C0 */ sll $v0, $v1, 3
/* 1963A4 80267AC4 00431023 */ subu $v0, $v0, $v1
/* 1963A8 80267AC8 00021080 */ sll $v0, $v0, 2
/* 1963AC 80267ACC 3C018028 */ lui $at, %hi(gActorSoundTable+4)
/* 1963AC 80267ACC 3C018028 */ lui $at, %hi(bActorSoundTable+4)
/* 1963B0 80267AD0 00220821 */ addu $at, $at, $v0
/* 1963B4 80267AD4 8C22146C */ lw $v0, %lo(gActorSoundTable+4)($at)
/* 1963B4 80267AD4 8C22146C */ lw $v0, %lo(bActorSoundTable+4)($at)
/* 1963B8 80267AD8 AC8201A0 */ sw $v0, 0x1a0($a0)
/* 1963BC 80267ADC 000310C0 */ sll $v0, $v1, 3
/* 1963C0 80267AE0 00431023 */ subu $v0, $v0, $v1
/* 1963C4 80267AE4 00021080 */ sll $v0, $v0, 2
/* 1963C8 80267AE8 3C018028 */ lui $at, %hi(gActorSoundTable+8)
/* 1963C8 80267AE8 3C018028 */ lui $at, %hi(bActorSoundTable+8)
/* 1963CC 80267AEC 00220821 */ addu $at, $at, $v0
/* 1963D0 80267AF0 8C221470 */ lw $v0, %lo(gActorSoundTable+8)($at)
/* 1963D0 80267AF0 8C221470 */ lw $v0, %lo(bActorSoundTable+8)($at)
/* 1963D4 80267AF4 AC8201A4 */ sw $v0, 0x1a4($a0)
/* 1963D8 80267AF8 000310C0 */ sll $v0, $v1, 3
/* 1963DC 80267AFC 00431023 */ subu $v0, $v0, $v1
/* 1963E0 80267B00 00021080 */ sll $v0, $v0, 2
/* 1963E4 80267B04 3C018028 */ lui $at, %hi(gActorSoundTable+12)
/* 1963E4 80267B04 3C018028 */ lui $at, %hi(bActorSoundTable+12)
/* 1963E8 80267B08 00220821 */ addu $at, $at, $v0
/* 1963EC 80267B0C 8C221474 */ lw $v0, %lo(gActorSoundTable+12)($at)
/* 1963EC 80267B0C 8C221474 */ lw $v0, %lo(bActorSoundTable+12)($at)
/* 1963F0 80267B10 AC8201A8 */ sw $v0, 0x1a8($a0)
/* 1963F4 80267B14 000310C0 */ sll $v0, $v1, 3
/* 1963F8 80267B18 00431023 */ subu $v0, $v0, $v1
/* 1963FC 80267B1C 00021080 */ sll $v0, $v0, 2
/* 196400 80267B20 3C018028 */ lui $at, %hi(gActorSoundTable+16)
/* 196400 80267B20 3C018028 */ lui $at, %hi(bActorSoundTable+16)
/* 196404 80267B24 00220821 */ addu $at, $at, $v0
/* 196408 80267B28 8C221478 */ lw $v0, %lo(gActorSoundTable+16)($at)
/* 196408 80267B28 8C221478 */ lw $v0, %lo(bActorSoundTable+16)($at)
/* 19640C 80267B2C AC8201AC */ sw $v0, 0x1ac($a0)
/* 196410 80267B30 000310C0 */ sll $v0, $v1, 3
/* 196414 80267B34 00431023 */ subu $v0, $v0, $v1
/* 196418 80267B38 00021080 */ sll $v0, $v0, 2
/* 19641C 80267B3C 3C018028 */ lui $at, %hi(gActorSoundTable+20)
/* 19641C 80267B3C 3C018028 */ lui $at, %hi(bActorSoundTable+20)
/* 196420 80267B40 00220821 */ addu $at, $at, $v0
/* 196424 80267B44 8C22147C */ lw $v0, %lo(gActorSoundTable+20)($at)
/* 196424 80267B44 8C22147C */ lw $v0, %lo(bActorSoundTable+20)($at)
/* 196428 80267B48 AC8201B0 */ sw $v0, 0x1b0($a0)
/* 19642C 80267B4C 000310C0 */ sll $v0, $v1, 3
/* 196430 80267B50 00431023 */ subu $v0, $v0, $v1
/* 196434 80267B54 00021080 */ sll $v0, $v0, 2
/* 196438 80267B58 3C018028 */ lui $at, %hi(gActorSoundTable+24)
/* 196438 80267B58 3C018028 */ lui $at, %hi(bActorSoundTable+24)
/* 19643C 80267B5C 00220821 */ addu $at, $at, $v0
/* 196440 80267B60 94221480 */ lhu $v0, %lo(gActorSoundTable+24)($at)
/* 196440 80267B60 94221480 */ lhu $v0, %lo(bActorSoundTable+24)($at)
/* 196444 80267B64 A48201B4 */ sh $v0, 0x1b4($a0)
/* 196448 80267B68 000310C0 */ sll $v0, $v1, 3
/* 19644C 80267B6C 00431023 */ subu $v0, $v0, $v1
/* 196450 80267B70 00021080 */ sll $v0, $v0, 2
/* 196454 80267B74 3C018028 */ lui $at, %hi(gActorSoundTable+0x1A)
/* 196454 80267B74 3C018028 */ lui $at, %hi(bActorSoundTable+0x1A)
/* 196458 80267B78 00220821 */ addu $at, $at, $v0
/* 19645C 80267B7C 94221482 */ lhu $v0, %lo(gActorSoundTable+0x1A)($at)
/* 19645C 80267B7C 94221482 */ lhu $v0, %lo(bActorSoundTable+0x1A)($at)
/* 196460 80267B80 10A00014 */ beqz $a1, .L80267BD4
/* 196464 80267B84 A48201B6 */ sh $v0, 0x1b6($a0)
.L80267B88:

32
asm/nonmatchings/code_197F40/ResetActorSounds.s generated
View File

@ -47,16 +47,16 @@ glabel L8026F8D4_19E1B4
/* 19E1B8 8026F8D8 000310C0 */ sll $v0, $v1, 3
/* 19E1BC 8026F8DC 00431023 */ subu $v0, $v0, $v1
/* 19E1C0 8026F8E0 00021080 */ sll $v0, $v0, 2
/* 19E1C4 8026F8E4 3C018028 */ lui $at, %hi(gActorSoundTable)
/* 19E1C4 8026F8E4 3C018028 */ lui $at, %hi(bActorSoundTable)
/* 19E1C8 8026F8E8 00220821 */ addu $at, $at, $v0
/* 19E1CC 8026F8EC 8C221468 */ lw $v0, %lo(gActorSoundTable)($at)
/* 19E1CC 8026F8EC 8C221468 */ lw $v0, %lo(bActorSoundTable)($at)
/* 19E1D0 8026F8F0 AC82019C */ sw $v0, 0x19c($a0)
/* 19E1D4 8026F8F4 000310C0 */ sll $v0, $v1, 3
/* 19E1D8 8026F8F8 00431023 */ subu $v0, $v0, $v1
/* 19E1DC 8026F8FC 00021080 */ sll $v0, $v0, 2
/* 19E1E0 8026F900 3C018028 */ lui $at, %hi(gActorSoundTable+4)
/* 19E1E0 8026F900 3C018028 */ lui $at, %hi(bActorSoundTable+4)
/* 19E1E4 8026F904 00220821 */ addu $at, $at, $v0
/* 19E1E8 8026F908 8C22146C */ lw $v0, %lo(gActorSoundTable+4)($at)
/* 19E1E8 8026F908 8C22146C */ lw $v0, %lo(bActorSoundTable+4)($at)
/* 19E1EC 8026F90C 0809BE78 */ j .L8026F9E0
/* 19E1F0 8026F910 AC8201A0 */ sw $v0, 0x1a0($a0)
glabel L8026F914_19E1F4
@ -64,16 +64,16 @@ glabel L8026F914_19E1F4
/* 19E1F8 8026F918 000310C0 */ sll $v0, $v1, 3
/* 19E1FC 8026F91C 00431023 */ subu $v0, $v0, $v1
/* 19E200 8026F920 00021080 */ sll $v0, $v0, 2
/* 19E204 8026F924 3C018028 */ lui $at, %hi(gActorSoundTable+8)
/* 19E204 8026F924 3C018028 */ lui $at, %hi(bActorSoundTable+8)
/* 19E208 8026F928 00220821 */ addu $at, $at, $v0
/* 19E20C 8026F92C 8C221470 */ lw $v0, %lo(gActorSoundTable+8)($at)
/* 19E20C 8026F92C 8C221470 */ lw $v0, %lo(bActorSoundTable+8)($at)
/* 19E210 8026F930 AC8201A4 */ sw $v0, 0x1a4($a0)
/* 19E214 8026F934 000310C0 */ sll $v0, $v1, 3
/* 19E218 8026F938 00431023 */ subu $v0, $v0, $v1
/* 19E21C 8026F93C 00021080 */ sll $v0, $v0, 2
/* 19E220 8026F940 3C018028 */ lui $at, %hi(gActorSoundTable+12)
/* 19E220 8026F940 3C018028 */ lui $at, %hi(bActorSoundTable+12)
/* 19E224 8026F944 00220821 */ addu $at, $at, $v0
/* 19E228 8026F948 8C221474 */ lw $v0, %lo(gActorSoundTable+12)($at)
/* 19E228 8026F948 8C221474 */ lw $v0, %lo(bActorSoundTable+12)($at)
/* 19E22C 8026F94C 0809BE78 */ j .L8026F9E0
/* 19E230 8026F950 AC8201A8 */ sw $v0, 0x1a8($a0)
glabel L8026F954_19E234
@ -81,9 +81,9 @@ glabel L8026F954_19E234
/* 19E238 8026F958 000218C0 */ sll $v1, $v0, 3
/* 19E23C 8026F95C 00621823 */ subu $v1, $v1, $v0
/* 19E240 8026F960 00031880 */ sll $v1, $v1, 2
/* 19E244 8026F964 3C028028 */ lui $v0, %hi(gActorSoundTable+16)
/* 19E244 8026F964 3C028028 */ lui $v0, %hi(bActorSoundTable+16)
/* 19E248 8026F968 00431021 */ addu $v0, $v0, $v1
/* 19E24C 8026F96C 8C421478 */ lw $v0, %lo(gActorSoundTable+16)($v0)
/* 19E24C 8026F96C 8C421478 */ lw $v0, %lo(bActorSoundTable+16)($v0)
/* 19E250 8026F970 0809BE78 */ j .L8026F9E0
/* 19E254 8026F974 AC8201AC */ sw $v0, 0x1ac($a0)
glabel L8026F978_19E258
@ -91,9 +91,9 @@ glabel L8026F978_19E258
/* 19E25C 8026F97C 000218C0 */ sll $v1, $v0, 3
/* 19E260 8026F980 00621823 */ subu $v1, $v1, $v0
/* 19E264 8026F984 00031880 */ sll $v1, $v1, 2
/* 19E268 8026F988 3C028028 */ lui $v0, %hi(gActorSoundTable+20)
/* 19E268 8026F988 3C028028 */ lui $v0, %hi(bActorSoundTable+20)
/* 19E26C 8026F98C 00431021 */ addu $v0, $v0, $v1
/* 19E270 8026F990 8C42147C */ lw $v0, %lo(gActorSoundTable+20)($v0)
/* 19E270 8026F990 8C42147C */ lw $v0, %lo(bActorSoundTable+20)($v0)
/* 19E274 8026F994 0809BE78 */ j .L8026F9E0
/* 19E278 8026F998 AC8201B0 */ sw $v0, 0x1b0($a0)
glabel L8026F99C_19E27C
@ -101,9 +101,9 @@ glabel L8026F99C_19E27C
/* 19E280 8026F9A0 000218C0 */ sll $v1, $v0, 3
/* 19E284 8026F9A4 00621823 */ subu $v1, $v1, $v0
/* 19E288 8026F9A8 00031880 */ sll $v1, $v1, 2
/* 19E28C 8026F9AC 3C028028 */ lui $v0, %hi(gActorSoundTable+24)
/* 19E28C 8026F9AC 3C028028 */ lui $v0, %hi(bActorSoundTable+24)
/* 19E290 8026F9B0 00431021 */ addu $v0, $v0, $v1
/* 19E294 8026F9B4 94421480 */ lhu $v0, %lo(gActorSoundTable+24)($v0)
/* 19E294 8026F9B4 94421480 */ lhu $v0, %lo(bActorSoundTable+24)($v0)
/* 19E298 8026F9B8 0809BE78 */ j .L8026F9E0
/* 19E29C 8026F9BC A48201B4 */ sh $v0, 0x1b4($a0)
glabel L8026F9C0_19E2A0
@ -111,9 +111,9 @@ glabel L8026F9C0_19E2A0
/* 19E2A4 8026F9C4 000218C0 */ sll $v1, $v0, 3
/* 19E2A8 8026F9C8 00621823 */ subu $v1, $v1, $v0
/* 19E2AC 8026F9CC 00031880 */ sll $v1, $v1, 2
/* 19E2B0 8026F9D0 3C028028 */ lui $v0, %hi(gActorSoundTable+0x1A)
/* 19E2B0 8026F9D0 3C028028 */ lui $v0, %hi(bActorSoundTable+0x1A)
/* 19E2B4 8026F9D4 00431021 */ addu $v0, $v0, $v1
/* 19E2B8 8026F9D8 94421482 */ lhu $v0, %lo(gActorSoundTable+0x1A)($v0)
/* 19E2B8 8026F9D8 94421482 */ lhu $v0, %lo(bActorSoundTable+0x1A)($v0)
/* 19E2BC 8026F9DC A48201B6 */ sh $v0, 0x1b6($a0)
.L8026F9E0:
/* 19E2C0 8026F9E0 8FBF0020 */ lw $ra, 0x20($sp)

8
asm/nonmatchings/code_6F10E0/func_80238B60_6F1C40.s generated
View File

@ -13,11 +13,11 @@ glabel func_80238B60_6F1C40
/* 6F1C60 80238B80 0040202D */ daddu $a0, $v0, $zero
/* 6F1C64 80238B84 90820136 */ lbu $v0, 0x136($a0)
/* 6F1C68 80238B88 00021080 */ sll $v0, $v0, 2
/* 6F1C6C 80238B8C 3C018028 */ lui $at, %hi(gActorTattles)
/* 6F1C6C 80238B8C 3C018028 */ lui $at, %hi(bActorTattles)
/* 6F1C70 80238B90 00220821 */ addu $at, $at, $v0
/* 6F1C74 80238B94 8C222B98 */ lw $v0, %lo(gActorTattles)($at)
/* 6F1C78 80238B98 3C038028 */ lui $v1, %hi(gActorTattles)
/* 6F1C7C 80238B9C 24632B98 */ addiu $v1, $v1, %lo(gActorTattles)
/* 6F1C74 80238B94 8C222B98 */ lw $v0, %lo(bActorTattles)($at)
/* 6F1C78 80238B98 3C038028 */ lui $v1, %hi(bActorTattles)
/* 6F1C7C 80238B9C 24632B98 */ addiu $v1, $v1, %lo(bActorTattles)
/* 6F1C80 80238BA0 14400003 */ bnez $v0, .L80238BB0
/* 6F1C84 80238BA4 AE020084 */ sw $v0, 0x84($s0)
/* 6F1C88 80238BA8 8C620000 */ lw $v0, ($v1)

4
asm/nonmatchings/code_6F10E0/func_80238BCC_6F1CAC.s generated
View File

@ -121,9 +121,9 @@ glabel func_80238BCC_6F1CAC
/* 6F1E6C 80238D8C AE020090 */ sw $v0, 0x90($s0)
/* 6F1E70 80238D90 90820136 */ lbu $v0, 0x136($a0)
/* 6F1E74 80238D94 00021080 */ sll $v0, $v0, 2
/* 6F1E78 80238D98 3C038028 */ lui $v1, %hi(gActorCamOffsets)
/* 6F1E78 80238D98 3C038028 */ lui $v1, %hi(bActorCamOffsets)
/* 6F1E7C 80238D9C 00621821 */ addu $v1, $v1, $v0
/* 6F1E80 80238DA0 80632EE8 */ lb $v1, %lo(gActorCamOffsets)($v1)
/* 6F1E80 80238DA0 80632EE8 */ lb $v1, %lo(bActorCamOffsets)($v1)
/* 6F1E84 80238DA4 8E020084 */ lw $v0, 0x84($s0)
/* 6F1E88 80238DA8 00431021 */ addu $v0, $v0, $v1
/* 6F1E8C 80238DAC AE020084 */ sw $v0, 0x84($s0)

6
src/code_190B20.c
View File

@ -8,7 +8,7 @@ s32 D_80280FC0[] = {
s32 D_80281454[] = { 0x78, 0x93, 0x99, 0xB2, -1 };
// TODO: struct for each table row. s32 s32 s32 s32 s32 s32 u16 u16?
s32 gActorSoundTable[] = {
s32 bActorSoundTable[] = {
0x000020DD, 0x000020DD, 0x000020DD, 0x000020DD, 0x000003E2, 0x0000010F, 0x001E001E,
0x000020DF, 0x000020DF, 0x000020DF, 0x000020DF, 0x000003E2, 0x0000010F, 0x001E001E,
0x000020DD, 0x000020DD, 0x000020DD, 0x000020DD, 0x000003E2, 0x0000010F, 0x001E001E,
@ -223,7 +223,7 @@ s32 gActorSoundTable[] = {
0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001E001E,
};
MessageID gActorTattles[] = {
MessageID bActorTattles[] = {
0x00000000, 0x00000000, 0x001C0079, 0x001C007A, 0x001C007B, 0x001C007C, 0x001C007D, 0x001C0000,
0x001C0002, 0x001C0001, 0x001C0009, 0x001C0007, 0x001C0008, 0x001C000A, 0x001C000A, 0x001C000B,
0x001C000C, 0x001C0015, 0x001C0014, 0x001C0017, 0x001C0016, 0x001C0018, 0x001C001A, 0x001C0019,
@ -253,7 +253,7 @@ MessageID gActorTattles[] = {
0x001C0095, 0x001C0093, 0x001C0093, 0x001C0093,
};
s32 gActorCamOffsets[] = {
s32 bActorCamOffsets[] = {
0x00000000, 0x00000000, 0x00050000, 0x00040000, 0x00040000, 0x00020000, 0x00030000, 0x00050000,
0x00040000, 0x00040000, 0x00050000, 0x00020000, 0x00030000, 0x00050000, 0x00050000, 0x00000000,
0x00060000, 0x00FEF100, 0x000E0000, 0x00050000, 0x00000000, 0x00000000, 0x00000000, 0x000A0000,

3
tools/symbol_addrs.txt
View File

@ -11948,3 +11948,6 @@ func_8004D428 = 0x8004D428; // type:func
func_802CCCB0 = 0x802CCCB0; // type:func
func_802CABE8 = 0x802CABE8; // type:func
func_802CAE50 = 0x802CAE50; // type:func
bActorCamOffsets = 0x80282ee8; // type:data size:0x350
bActorTattles = 0x80282b98; // type:data size:0x350
bActorSoundTable = 0x80281468; // type:data size:0x1730

2
undefined_syms_auto.txt
View File

@ -2844,8 +2844,6 @@ D_802187E4_6DC584 = 0x802187E4;
D_8008F0A0 = 0x8008F0A0;
D_8008F2E4 = 0x8008F2E4;
D_8008FC44 = 0x8008FC44;
gActorTattles = 0x80282B98;
gActorCamOffsets = 0x80282EE8;
D_80282EE9 = 0x80282EE9;
D_80282EEA = 0x80282EEA;
D_8023CDA0 = 0x8023CDA0;