mirror of
https://github.com/pmret/papermario.git
synced 2024-11-18 17:02:46 +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>
36 lines
1.6 KiB
ArmAsm
36 lines
1.6 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_8006874C
|
|
/* 43B4C 8006874C 8FA90010 */ lw $t1, 0x10($sp)
|
|
/* 43B50 80068750 00071200 */ sll $v0, $a3, 8
|
|
/* 43B54 80068754 30C600FF */ andi $a2, $a2, 0xff
|
|
/* 43B58 80068758 00461825 */ or $v1, $v0, $a2
|
|
/* 43B5C 8006875C 24080003 */ addiu $t0, $zero, 3
|
|
/* 43B60 80068760 30E700FF */ andi $a3, $a3, 0xff
|
|
/* 43B64 80068764 00601021 */ addu $v0, $v1, $zero
|
|
.L80068768:
|
|
/* 43B68 80068768 304300FF */ andi $v1, $v0, 0xff
|
|
/* 43B6C 8006876C 00031840 */ sll $v1, $v1, 1
|
|
/* 43B70 80068770 00651821 */ addu $v1, $v1, $a1
|
|
/* 43B74 80068774 94630000 */ lhu $v1, ($v1)
|
|
/* 43B78 80068778 304200FF */ andi $v0, $v0, 0xff
|
|
/* 43B7C 8006877C 00021040 */ sll $v0, $v0, 1
|
|
/* 43B80 80068780 00A21021 */ addu $v0, $a1, $v0
|
|
/* 43B84 80068784 A4480000 */ sh $t0, ($v0)
|
|
/* 43B88 80068788 8C820060 */ lw $v0, 0x60($a0)
|
|
/* 43B8C 8006878C 3066FFFF */ andi $a2, $v1, 0xffff
|
|
/* 43B90 80068790 00C2102A */ slt $v0, $a2, $v0
|
|
/* 43B94 80068794 54400005 */ bnel $v0, $zero, .L800687AC
|
|
/* 43B98 80068798 A5230000 */ sh $v1, ($t1)
|
|
/* 43B9C 8006879C 00061202 */ srl $v0, $a2, 8
|
|
/* 43BA0 800687A0 1047FFF1 */ beq $v0, $a3, .L80068768
|
|
/* 43BA4 800687A4 00601021 */ addu $v0, $v1, $zero
|
|
/* 43BA8 800687A8 A5230000 */ sh $v1, ($t1)
|
|
.L800687AC:
|
|
/* 43BAC 800687AC 03E00008 */ jr $ra
|
|
/* 43BB0 800687B0 00001021 */ addu $v0, $zero, $zero
|
|
/* 43BB4 800687B4 00000000 */ nop
|
|
/* 43BB8 800687B8 00000000 */ nop
|
|
/* 43BBC 800687BC 00000000 */ nop
|