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>
43 lines
2.1 KiB
ArmAsm
43 lines
2.1 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_80049170
|
|
/* 24570 80049170 27BDFFD8 */ addiu $sp, $sp, -0x28
|
|
/* 24574 80049174 AFB1001C */ sw $s1, 0x1c($sp)
|
|
/* 24578 80049178 0080882D */ daddu $s1, $a0, $zero
|
|
/* 2457C 8004917C AFB20020 */ sw $s2, 0x20($sp)
|
|
/* 24580 80049180 00A0902D */ daddu $s2, $a1, $zero
|
|
/* 24584 80049184 AFBF0024 */ sw $ra, 0x24($sp)
|
|
/* 24588 80049188 AFB00018 */ sw $s0, 0x18($sp)
|
|
/* 2458C 8004918C 822400A4 */ lb $a0, 0xa4($s1)
|
|
/* 24590 80049190 0C00FA6A */ jal func_8003E9A8
|
|
/* 24594 80049194 00C0802D */ daddu $s0, $a2, $zero
|
|
/* 24598 80049198 3C03FFFF */ lui $v1, 0xffff
|
|
/* 2459C 8004919C 02031824 */ and $v1, $s0, $v1
|
|
/* 245A0 800491A0 34650002 */ ori $a1, $v1, 2
|
|
/* 245A4 800491A4 32100001 */ andi $s0, $s0, 1
|
|
/* 245A8 800491A8 12000003 */ beqz $s0, .L800491B8
|
|
/* 245AC 800491AC 0040182D */ daddu $v1, $v0, $zero
|
|
/* 245B0 800491B0 3C020001 */ lui $v0, 1
|
|
/* 245B4 800491B4 00A22825 */ or $a1, $a1, $v0
|
|
.L800491B8:
|
|
/* 245B8 800491B8 8C620018 */ lw $v0, 0x18($v1)
|
|
/* 245BC 800491BC 9442002A */ lhu $v0, 0x2a($v0)
|
|
/* 245C0 800491C0 30420020 */ andi $v0, $v0, 0x20
|
|
/* 245C4 800491C4 10400002 */ beqz $v0, .L800491D0
|
|
/* 245C8 800491C8 3C020002 */ lui $v0, 2
|
|
/* 245CC 800491CC 00A22825 */ or $a1, $a1, $v0
|
|
.L800491D0:
|
|
/* 245D0 800491D0 C6200040 */ lwc1 $f0, 0x40($s1)
|
|
/* 245D4 800491D4 E7A00010 */ swc1 $f0, 0x10($sp)
|
|
/* 245D8 800491D8 8E260038 */ lw $a2, 0x38($s1)
|
|
/* 245DC 800491DC 8E27003C */ lw $a3, 0x3c($s1)
|
|
/* 245E0 800491E0 0C053B83 */ jal func_8014EE0C
|
|
/* 245E4 800491E4 0240202D */ daddu $a0, $s2, $zero
|
|
/* 245E8 800491E8 8FBF0024 */ lw $ra, 0x24($sp)
|
|
/* 245EC 800491EC 8FB20020 */ lw $s2, 0x20($sp)
|
|
/* 245F0 800491F0 8FB1001C */ lw $s1, 0x1c($sp)
|
|
/* 245F4 800491F4 8FB00018 */ lw $s0, 0x18($sp)
|
|
/* 245F8 800491F8 03E00008 */ jr $ra
|
|
/* 245FC 800491FC 27BD0028 */ addiu $sp, $sp, 0x28
|