mirror of
https://github.com/pmret/papermario.git
synced 2024-11-19 01:12:28 +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>
24 lines
1.1 KiB
ArmAsm
24 lines
1.1 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_800334C0
|
|
/* E8C0 800334C0 3C058007 */ lui $a1, %hi(D_8007417C)
|
|
/* E8C4 800334C4 8CA5417C */ lw $a1, %lo(D_8007417C)($a1)
|
|
/* E8C8 800334C8 240600FF */ addiu $a2, $zero, 0xff
|
|
/* E8CC 800334CC 84A200B6 */ lh $v0, 0xb6($a1)
|
|
/* E8D0 800334D0 94A300B6 */ lhu $v1, 0xb6($a1)
|
|
/* E8D4 800334D4 14460003 */ bne $v0, $a2, .L800334E4
|
|
/* E8D8 800334D8 00641021 */ addu $v0, $v1, $a0
|
|
/* E8DC 800334DC 03E00008 */ jr $ra
|
|
/* E8E0 800334E0 24020001 */ addiu $v0, $zero, 1
|
|
.L800334E4:
|
|
/* E8E4 800334E4 A4A200B6 */ sh $v0, 0xb6($a1)
|
|
/* E8E8 800334E8 00021400 */ sll $v0, $v0, 0x10
|
|
/* E8EC 800334EC 00021403 */ sra $v0, $v0, 0x10
|
|
/* E8F0 800334F0 28420100 */ slti $v0, $v0, 0x100
|
|
/* E8F4 800334F4 50400001 */ beql $v0, $zero, .L800334FC
|
|
/* E8F8 800334F8 A4A600B6 */ sh $a2, 0xb6($a1)
|
|
.L800334FC:
|
|
/* E8FC 800334FC 03E00008 */ jr $ra
|
|
/* E900 80033500 0000102D */ daddu $v0, $zero, $zero
|