mirror of
https://github.com/pmret/papermario.git
synced 2024-11-15 07:22:29 +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>
41 lines
1.8 KiB
ArmAsm
41 lines
1.8 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_800522A8
|
|
/* 2D6A8 800522A8 24A901D4 */ addiu $t1, $a1, 0x1d4
|
|
/* 2D6AC 800522AC 8CA70030 */ lw $a3, 0x30($a1)
|
|
/* 2D6B0 800522B0 8CA20034 */ lw $v0, 0x34($a1)
|
|
/* 2D6B4 800522B4 00E2102B */ sltu $v0, $a3, $v0
|
|
/* 2D6B8 800522B8 1040001A */ beqz $v0, .L80052324
|
|
/* 2D6BC 800522BC 0000402D */ daddu $t0, $zero, $zero
|
|
/* 2D6C0 800522C0 24A601D6 */ addiu $a2, $a1, 0x1d6
|
|
.L800522C4:
|
|
/* 2D6C4 800522C4 8CA20030 */ lw $v0, 0x30($a1)
|
|
/* 2D6C8 800522C8 00E21023 */ subu $v0, $a3, $v0
|
|
/* 2D6CC 800522CC 000210C0 */ sll $v0, $v0, 3
|
|
/* 2D6D0 800522D0 244207B4 */ addiu $v0, $v0, 0x7b4
|
|
/* 2D6D4 800522D4 00821821 */ addu $v1, $a0, $v0
|
|
/* 2D6D8 800522D8 90620007 */ lbu $v0, 7($v1)
|
|
/* 2D6DC 800522DC 1040000C */ beqz $v0, .L80052310
|
|
/* 2D6E0 800522E0 00000000 */ nop
|
|
/* 2D6E4 800522E4 90620001 */ lbu $v0, 1($v1)
|
|
/* 2D6E8 800522E8 A1220000 */ sb $v0, ($t1)
|
|
/* 2D6EC 800522EC 90620002 */ lbu $v0, 2($v1)
|
|
/* 2D6F0 800522F0 25080001 */ addiu $t0, $t0, 1
|
|
/* 2D6F4 800522F4 A0C2FFFF */ sb $v0, -1($a2)
|
|
/* 2D6F8 800522F8 90620006 */ lbu $v0, 6($v1)
|
|
/* 2D6FC 800522FC 25290004 */ addiu $t1, $t1, 4
|
|
/* 2D700 80052300 A0C20000 */ sb $v0, ($a2)
|
|
/* 2D704 80052304 2D020004 */ sltiu $v0, $t0, 4
|
|
/* 2D708 80052308 10400006 */ beqz $v0, .L80052324
|
|
/* 2D70C 8005230C 24C60004 */ addiu $a2, $a2, 4
|
|
.L80052310:
|
|
/* 2D710 80052310 8CA20034 */ lw $v0, 0x34($a1)
|
|
/* 2D714 80052314 24E70001 */ addiu $a3, $a3, 1
|
|
/* 2D718 80052318 00E2102B */ sltu $v0, $a3, $v0
|
|
/* 2D71C 8005231C 1440FFE9 */ bnez $v0, .L800522C4
|
|
/* 2D720 80052320 00000000 */ nop
|
|
.L80052324:
|
|
/* 2D724 80052324 03E00008 */ jr $ra
|
|
/* 2D728 80052328 00000000 */ nop
|