mirror of
https://github.com/pmret/papermario.git
synced 2024-11-18 17:02:46 +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>
26 lines
1.2 KiB
ArmAsm
26 lines
1.2 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_8006C7A0
|
|
/* 47BA0 8006C7A0 27BDFFE0 */ addiu $sp, $sp, -0x20
|
|
/* 47BA4 8006C7A4 AFB00010 */ sw $s0, 0x10($sp)
|
|
/* 47BA8 8006C7A8 00808021 */ addu $s0, $a0, $zero
|
|
/* 47BAC 8006C7AC AFB10014 */ sw $s1, 0x14($sp)
|
|
/* 47BB0 8006C7B0 AFBF0018 */ sw $ra, 0x18($sp)
|
|
/* 47BB4 8006C7B4 0C01B5F0 */ jal func_8006D7C0
|
|
/* 47BB8 8006C7B8 00A08821 */ addu $s1, $a1, $zero
|
|
/* 47BBC 8006C7BC 14400006 */ bnez $v0, .L8006C7D8
|
|
/* 47BC0 8006C7C0 2402FFFF */ addiu $v0, $zero, -1
|
|
/* 47BC4 8006C7C4 3C02A000 */ lui $v0, 0xa000
|
|
/* 47BC8 8006C7C8 02021025 */ or $v0, $s0, $v0
|
|
/* 47BCC 8006C7CC 8C430000 */ lw $v1, ($v0)
|
|
/* 47BD0 8006C7D0 00001021 */ addu $v0, $zero, $zero
|
|
/* 47BD4 8006C7D4 AE230000 */ sw $v1, ($s1)
|
|
.L8006C7D8:
|
|
/* 47BD8 8006C7D8 8FBF0018 */ lw $ra, 0x18($sp)
|
|
/* 47BDC 8006C7DC 8FB10014 */ lw $s1, 0x14($sp)
|
|
/* 47BE0 8006C7E0 8FB00010 */ lw $s0, 0x10($sp)
|
|
/* 47BE4 8006C7E4 03E00008 */ jr $ra
|
|
/* 47BE8 8006C7E8 27BD0020 */ addiu $sp, $sp, 0x20
|
|
/* 47BEC 8006C7EC 00000000 */ nop
|