mirror of
https://github.com/pmret/papermario.git
synced 2024-09-20 08:21:48 +02: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_80053BE8
|
|
/* 2EFE8 80053BE8 30A20070 */ andi $v0, $a1, 0x70
|
|
/* 2EFEC 80053BEC 00021082 */ srl $v0, $v0, 2
|
|
/* 2EFF0 80053BF0 00822021 */ addu $a0, $a0, $v0
|
|
/* 2EFF4 80053BF4 8C8212EC */ lw $v0, 0x12ec($a0)
|
|
/* 2EFF8 80053BF8 00063080 */ sll $a2, $a2, 2
|
|
/* 2EFFC 80053BFC 00C23021 */ addu $a2, $a2, $v0
|
|
/* 2F000 80053C00 8CC60000 */ lw $a2, ($a2)
|
|
/* 2F004 80053C04 8CC4002C */ lw $a0, 0x2c($a2)
|
|
/* 2F008 80053C08 90820000 */ lbu $v0, ($a0)
|
|
/* 2F00C 80053C0C 30A50003 */ andi $a1, $a1, 3
|
|
/* 2F010 80053C10 00A2102B */ sltu $v0, $a1, $v0
|
|
/* 2F014 80053C14 10400009 */ beqz $v0, .L80053C3C
|
|
/* 2F018 80053C18 00000000 */ nop
|
|
/* 2F01C 80053C1C 00051080 */ sll $v0, $a1, 2
|
|
/* 2F020 80053C20 00821021 */ addu $v0, $a0, $v0
|
|
/* 2F024 80053C24 94430004 */ lhu $v1, 4($v0)
|
|
/* 2F028 80053C28 00641821 */ addu $v1, $v1, $a0
|
|
/* 2F02C 80053C2C ACE30000 */ sw $v1, ($a3)
|
|
/* 2F030 80053C30 94420006 */ lhu $v0, 6($v0)
|
|
/* 2F034 80053C34 08014F13 */ j .L80053C4C
|
|
/* 2F038 80053C38 00441021 */ addu $v0, $v0, $a0
|
|
.L80053C3C:
|
|
/* 2F03C 80053C3C 3C028008 */ lui $v0, %hi(D_8007854C)
|
|
/* 2F040 80053C40 2442854C */ addiu $v0, $v0, %lo(D_8007854C)
|
|
/* 2F044 80053C44 ACE20000 */ sw $v0, ($a3)
|
|
/* 2F048 80053C48 24420004 */ addiu $v0, $v0, 4
|
|
.L80053C4C:
|
|
/* 2F04C 80053C4C ACE20004 */ sw $v0, 4($a3)
|
|
/* 2F050 80053C50 03E00008 */ jr $ra
|
|
/* 2F054 80053C54 00C0102D */ daddu $v0, $a2, $zero
|