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>
29 lines
1.4 KiB
ArmAsm
29 lines
1.4 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_8005F300
|
|
/* 3A700 8005F300 27BDFFE0 */ addiu $sp, $sp, -0x20
|
|
/* 3A704 8005F304 AFB10014 */ sw $s1, 0x14($sp)
|
|
/* 3A708 8005F308 0080882D */ daddu $s1, $a0, $zero
|
|
/* 3A70C 8005F30C AFB00010 */ sw $s0, 0x10($sp)
|
|
/* 3A710 8005F310 AFBF0018 */ sw $ra, 0x18($sp)
|
|
/* 3A714 8005F314 0C018177 */ jal func_800605DC
|
|
/* 3A718 8005F318 00A0802D */ daddu $s0, $a1, $zero
|
|
/* 3A71C 8005F31C 00102040 */ sll $a0, $s0, 1
|
|
/* 3A720 8005F320 00902021 */ addu $a0, $a0, $s0
|
|
/* 3A724 8005F324 00042040 */ sll $a0, $a0, 1
|
|
/* 3A728 8005F328 3C02800B */ lui $v0, %hi(D_800B1D48)
|
|
/* 3A72C 8005F32C 24421D48 */ addiu $v0, $v0, %lo(D_800B1D48)
|
|
/* 3A730 8005F330 00822021 */ addu $a0, $a0, $v0
|
|
/* 3A734 8005F334 0220282D */ daddu $a1, $s1, $zero
|
|
/* 3A738 8005F338 0C019188 */ jal func_80064620
|
|
/* 3A73C 8005F33C 24060006 */ addiu $a2, $zero, 6
|
|
/* 3A740 8005F340 0C018181 */ jal func_80060604
|
|
/* 3A744 8005F344 00000000 */ nop
|
|
/* 3A748 8005F348 8FBF0018 */ lw $ra, 0x18($sp)
|
|
/* 3A74C 8005F34C 8FB10014 */ lw $s1, 0x14($sp)
|
|
/* 3A750 8005F350 8FB00010 */ lw $s0, 0x10($sp)
|
|
/* 3A754 8005F354 03E00008 */ jr $ra
|
|
/* 3A758 8005F358 27BD0020 */ addiu $sp, $sp, 0x20
|
|
/* 3A75C 8005F35C 00000000 */ nop
|