mirror of
https://github.com/pmret/papermario.git
synced 2024-11-18 08:52:40 +01:00
3315d6010f
* all non-world rodata migrated * data disasm * kinda working * updated yaml * bloop * linker header * configure 2.0 * bin * mass rename to remove code_ * pause rename * battle partner stuff * whew * more renames * more renames * more renaming * it builds! * updates * remove main prefix * one more thing * crc, yay0 * .data, .rodata, .bss * img * dead_atan2 * it buildsgit add -A * split battle/partner/6FAD10 * rm &s on sleepy_sheep syms * sha1sum ninja rule description * OK but commented out PaperMarioMapFS and PaperMarioNpcSprites * uncomment * fix mapfs * match func_8003CFB4 * . * clean up and name npc_iter_no_op * npc.c * enable cc warnings * name npc_find_near * use singular options.asset_path * smores * cc_dsl only when needed * kinda fix configure for splat refactor2 * ok! * new msg format * remove old msg format docs * slight bug fixes, splat adjustment * git subrepo pull (merge) --force tools/splat subrepo: subdir: "tools/splat" merged: "cfc140bb76" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "cfc140bb76" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * git subrepo pull (merge) --force tools/splat subrepo: subdir: "tools/splat" merged: "85349befcd" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "85349befcd" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Update symbol addrs * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "a44631e194" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "a44631e194" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" Co-authored-by: Alex Bates <hi@imalex.xyz>
55 lines
2.5 KiB
ArmAsm
55 lines
2.5 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_800546A8
|
|
/* 2FAA8 800546A8 00A0582D */ daddu $t3, $a1, $zero
|
|
/* 2FAAC 800546AC 3C03800A */ lui $v1, %hi(D_8009A5A0)
|
|
/* 2FAB0 800546B0 8C63A5A0 */ lw $v1, %lo(D_8009A5A0)($v1)
|
|
/* 2FAB4 800546B4 93AA0013 */ lbu $t2, 0x13($sp)
|
|
/* 2FAB8 800546B8 9162000E */ lbu $v0, 0xe($t3)
|
|
/* 2FABC 800546BC 8C690004 */ lw $t1, 4($v1)
|
|
/* 2FAC0 800546C0 14400021 */ bnez $v0, .L80054748
|
|
/* 2FAC4 800546C4 C4620000 */ lwc1 $f2, ($v1)
|
|
/* 2FAC8 800546C8 10E0001D */ beqz $a3, .L80054740
|
|
/* 2FACC 800546CC 0000402D */ daddu $t0, $zero, $zero
|
|
.L800546D0:
|
|
/* 2FAD0 800546D0 8CC30000 */ lw $v1, ($a2)
|
|
/* 2FAD4 800546D4 50600016 */ beql $v1, $zero, .L80054730
|
|
/* 2FAD8 800546D8 ACC90000 */ sw $t1, ($a2)
|
|
/* 2FADC 800546DC 8C620000 */ lw $v0, ($v1)
|
|
/* 2FAE0 800546E0 10400002 */ beqz $v0, .L800546EC
|
|
/* 2FAE4 800546E4 00441021 */ addu $v0, $v0, $a0
|
|
/* 2FAE8 800546E8 AC620000 */ sw $v0, ($v1)
|
|
.L800546EC:
|
|
/* 2FAEC 800546EC 8C620008 */ lw $v0, 8($v1)
|
|
/* 2FAF0 800546F0 10400002 */ beqz $v0, .L800546FC
|
|
/* 2FAF4 800546F4 00451021 */ addu $v0, $v0, $a1
|
|
/* 2FAF8 800546F8 AC620008 */ sw $v0, 8($v1)
|
|
.L800546FC:
|
|
/* 2FAFC 800546FC 8C620018 */ lw $v0, 0x18($v1)
|
|
/* 2FB00 80054700 10400002 */ beqz $v0, .L8005470C
|
|
/* 2FB04 80054704 00451021 */ addu $v0, $v0, $a1
|
|
/* 2FB08 80054708 AC620018 */ sw $v0, 0x18($v1)
|
|
.L8005470C:
|
|
/* 2FB0C 8005470C 8C62002C */ lw $v0, 0x2c($v1)
|
|
/* 2FB10 80054710 10400002 */ beqz $v0, .L8005471C
|
|
/* 2FB14 80054714 00451021 */ addu $v0, $v0, $a1
|
|
/* 2FB18 80054718 AC62002C */ sw $v0, 0x2c($v1)
|
|
.L8005471C:
|
|
/* 2FB1C 8005471C C4600020 */ lwc1 $f0, 0x20($v1)
|
|
/* 2FB20 80054720 46800020 */ cvt.s.w $f0, $f0
|
|
/* 2FB24 80054724 46020003 */ div.s $f0, $f0, $f2
|
|
/* 2FB28 80054728 A06A0025 */ sb $t2, 0x25($v1)
|
|
/* 2FB2C 8005472C E4600020 */ swc1 $f0, 0x20($v1)
|
|
.L80054730:
|
|
/* 2FB30 80054730 25080001 */ addiu $t0, $t0, 1
|
|
/* 2FB34 80054734 0107102B */ sltu $v0, $t0, $a3
|
|
/* 2FB38 80054738 1440FFE5 */ bnez $v0, .L800546D0
|
|
/* 2FB3C 8005473C 24C60004 */ addiu $a2, $a2, 4
|
|
.L80054740:
|
|
/* 2FB40 80054740 24020001 */ addiu $v0, $zero, 1
|
|
/* 2FB44 80054744 A162000E */ sb $v0, 0xe($t3)
|
|
.L80054748:
|
|
/* 2FB48 80054748 03E00008 */ jr $ra
|
|
/* 2FB4C 8005474C 00000000 */ nop
|