mirror of
https://github.com/pmret/papermario.git
synced 2024-11-10 04:52:34 +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>
35 lines
1.6 KiB
ArmAsm
35 lines
1.6 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_800505E4
|
|
/* 2B9E4 800505E4 00041903 */ sra $v1, $a0, 4
|
|
/* 2B9E8 800505E8 00041043 */ sra $v0, $a0, 1
|
|
/* 2B9EC 800505EC 00621821 */ addu $v1, $v1, $v0
|
|
/* 2B9F0 800505F0 30630001 */ andi $v1, $v1, 1
|
|
/* 2B9F4 800505F4 00041183 */ sra $v0, $a0, 6
|
|
/* 2B9F8 800505F8 3042000F */ andi $v0, $v0, 0xf
|
|
/* 2B9FC 800505FC 00042080 */ sll $a0, $a0, 2
|
|
/* 2BA00 80050600 308400F0 */ andi $a0, $a0, 0xf0
|
|
/* 2BA04 80050604 10600009 */ beqz $v1, .L8005062C
|
|
/* 2BA08 80050608 00442021 */ addu $a0, $v0, $a0
|
|
/* 2BA0C 8005060C 30C300FF */ andi $v1, $a2, 0xff
|
|
/* 2BA10 80050610 00041080 */ sll $v0, $a0, 2
|
|
/* 2BA14 80050614 00441021 */ addu $v0, $v0, $a0
|
|
/* 2BA18 80050618 00620018 */ mult $v1, $v0
|
|
/* 2BA1C 8005061C 00003812 */ mflo $a3
|
|
/* 2BA20 80050620 00071203 */ sra $v0, $a3, 8
|
|
/* 2BA24 80050624 08014192 */ j .L80050648
|
|
/* 2BA28 80050628 00A21021 */ addu $v0, $a1, $v0
|
|
.L8005062C:
|
|
/* 2BA2C 8005062C 30C300FF */ andi $v1, $a2, 0xff
|
|
/* 2BA30 80050630 00041080 */ sll $v0, $a0, 2
|
|
/* 2BA34 80050634 00441021 */ addu $v0, $v0, $a0
|
|
/* 2BA38 80050638 00620018 */ mult $v1, $v0
|
|
/* 2BA3C 8005063C 00003812 */ mflo $a3
|
|
/* 2BA40 80050640 00071203 */ sra $v0, $a3, 8
|
|
/* 2BA44 80050644 00A21023 */ subu $v0, $a1, $v0
|
|
.L80050648:
|
|
/* 2BA48 80050648 00021400 */ sll $v0, $v0, 0x10
|
|
/* 2BA4C 8005064C 03E00008 */ jr $ra
|
|
/* 2BA50 80050650 00021403 */ sra $v0, $v0, 0x10
|