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>
25 lines
1.2 KiB
ArmAsm
25 lines
1.2 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_80060E90
|
|
/* 3C290 80060E90 27BDFFE8 */ addiu $sp, $sp, -0x18
|
|
/* 3C294 80060E94 AFB00010 */ sw $s0, 0x10($sp)
|
|
/* 3C298 80060E98 AFBF0014 */ sw $ra, 0x14($sp)
|
|
/* 3C29C 80060E9C 0C01ACD0 */ jal func_8006B340
|
|
/* 3C2A0 80060EA0 00808021 */ addu $s0, $a0, $zero
|
|
/* 3C2A4 80060EA4 3C038009 */ lui $v1, %hi(D_80093D4C)
|
|
/* 3C2A8 80060EA8 8C633D4C */ lw $v1, %lo(D_80093D4C)($v1)
|
|
/* 3C2AC 80060EAC 00402021 */ addu $a0, $v0, $zero
|
|
/* 3C2B0 80060EB0 3C018009 */ lui $at, %hi(D_80093D4C)
|
|
/* 3C2B4 80060EB4 AC303D4C */ sw $s0, %lo(D_80093D4C)($at)
|
|
/* 3C2B8 80060EB8 0C01ACEC */ jal func_8006B3B0
|
|
/* 3C2BC 80060EBC AE030000 */ sw $v1, ($s0)
|
|
/* 3C2C0 80060EC0 00001021 */ addu $v0, $zero, $zero
|
|
/* 3C2C4 80060EC4 8FBF0014 */ lw $ra, 0x14($sp)
|
|
/* 3C2C8 80060EC8 8FB00010 */ lw $s0, 0x10($sp)
|
|
/* 3C2CC 80060ECC 03E00008 */ jr $ra
|
|
/* 3C2D0 80060ED0 27BD0018 */ addiu $sp, $sp, 0x18
|
|
/* 3C2D4 80060ED4 00000000 */ nop
|
|
/* 3C2D8 80060ED8 00000000 */ nop
|
|
/* 3C2DC 80060EDC 00000000 */ nop
|