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>
60 lines
2.6 KiB
ArmAsm
60 lines
2.6 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_80032534
|
|
/* D934 80032534 44857000 */ mtc1 $a1, $f14
|
|
/* D938 80032538 44868000 */ mtc1 $a2, $f16
|
|
/* D93C 8003253C 14800003 */ bnez $a0, .L8003254C
|
|
/* D940 80032540 24020006 */ addiu $v0, $zero, 6
|
|
.L80032544:
|
|
/* D944 80032544 03E00008 */ jr $ra
|
|
/* D948 80032548 0000102D */ daddu $v0, $zero, $zero
|
|
.L8003254C:
|
|
/* D94C 8003254C 8C830000 */ lw $v1, ($a0)
|
|
/* D950 80032550 1462FFFC */ bne $v1, $v0, .L80032544
|
|
/* D954 80032554 00000000 */ nop
|
|
/* D958 80032558 C482000C */ lwc1 $f2, 0xc($a0)
|
|
/* D95C 8003255C 46027301 */ sub.s $f12, $f14, $f2
|
|
/* D960 80032560 C4880018 */ lwc1 $f8, 0x18($a0)
|
|
/* D964 80032564 46024081 */ sub.s $f2, $f8, $f2
|
|
/* D968 80032568 460C1282 */ mul.s $f10, $f2, $f12
|
|
/* D96C 8003256C 00000000 */ nop
|
|
/* D970 80032570 C4800014 */ lwc1 $f0, 0x14($a0)
|
|
/* D974 80032574 46008301 */ sub.s $f12, $f16, $f0
|
|
/* D978 80032578 C4840020 */ lwc1 $f4, 0x20($a0)
|
|
/* D97C 8003257C 46002001 */ sub.s $f0, $f4, $f0
|
|
/* D980 80032580 460C0182 */ mul.s $f6, $f0, $f12
|
|
/* D984 80032584 00000000 */ nop
|
|
/* D988 80032588 46087301 */ sub.s $f12, $f14, $f8
|
|
/* D98C 8003258C 460C1082 */ mul.s $f2, $f2, $f12
|
|
/* D990 80032590 00000000 */ nop
|
|
/* D994 80032594 46048301 */ sub.s $f12, $f16, $f4
|
|
/* D998 80032598 460C0002 */ mul.s $f0, $f0, $f12
|
|
/* D99C 8003259C 00000000 */ nop
|
|
/* D9A0 800325A0 46065280 */ add.s $f10, $f10, $f6
|
|
/* D9A4 800325A4 44802000 */ mtc1 $zero, $f4
|
|
/* D9A8 800325A8 00000000 */ nop
|
|
/* D9AC 800325AC 4604503C */ c.lt.s $f10, $f4
|
|
/* D9B0 800325B0 00000000 */ nop
|
|
/* D9B4 800325B4 45000005 */ bc1f .L800325CC
|
|
/* D9B8 800325B8 46001080 */ add.s $f2, $f2, $f0
|
|
/* D9BC 800325BC 4604103C */ c.lt.s $f2, $f4
|
|
/* D9C0 800325C0 00000000 */ nop
|
|
/* D9C4 800325C4 4501000C */ bc1t .L800325F8
|
|
/* D9C8 800325C8 2402FFFF */ addiu $v0, $zero, -1
|
|
.L800325CC:
|
|
/* D9CC 800325CC 44800000 */ mtc1 $zero, $f0
|
|
/* D9D0 800325D0 00000000 */ nop
|
|
/* D9D4 800325D4 460A003C */ c.lt.s $f0, $f10
|
|
/* D9D8 800325D8 00000000 */ nop
|
|
/* D9DC 800325DC 45000006 */ bc1f .L800325F8
|
|
/* D9E0 800325E0 0000102D */ daddu $v0, $zero, $zero
|
|
/* D9E4 800325E4 4602003C */ c.lt.s $f0, $f2
|
|
/* D9E8 800325E8 00000000 */ nop
|
|
/* D9EC 800325EC 45010002 */ bc1t .L800325F8
|
|
/* D9F0 800325F0 24020001 */ addiu $v0, $zero, 1
|
|
/* D9F4 800325F4 0000102D */ daddu $v0, $zero, $zero
|
|
.L800325F8:
|
|
/* D9F8 800325F8 03E00008 */ jr $ra
|
|
/* D9FC 800325FC 00000000 */ nop
|