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>
22 lines
979 B
ArmAsm
22 lines
979 B
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_80053858
|
|
/* 2EC58 80053858 9482001A */ lhu $v0, 0x1a($a0)
|
|
/* 2EC5C 8005385C 2442FFFF */ addiu $v0, $v0, -1
|
|
/* 2EC60 80053860 A482001A */ sh $v0, 0x1a($a0)
|
|
/* 2EC64 80053864 00021400 */ sll $v0, $v0, 0x10
|
|
/* 2EC68 80053868 10400006 */ beqz $v0, .L80053884
|
|
/* 2EC6C 8005386C 00000000 */ nop
|
|
/* 2EC70 80053870 8C820010 */ lw $v0, 0x10($a0)
|
|
/* 2EC74 80053874 8C830014 */ lw $v1, 0x14($a0)
|
|
/* 2EC78 80053878 00431021 */ addu $v0, $v0, $v1
|
|
/* 2EC7C 8005387C 03E00008 */ jr $ra
|
|
/* 2EC80 80053880 AC820010 */ sw $v0, 0x10($a0)
|
|
.L80053884:
|
|
/* 2EC84 80053884 84820018 */ lh $v0, 0x18($a0)
|
|
/* 2EC88 80053888 AC800014 */ sw $zero, 0x14($a0)
|
|
/* 2EC8C 8005388C 00021400 */ sll $v0, $v0, 0x10
|
|
/* 2EC90 80053890 03E00008 */ jr $ra
|
|
/* 2EC94 80053894 AC820010 */ sw $v0, 0x10($a0)
|