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>
63 lines
2.9 KiB
ArmAsm
63 lines
2.9 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_8006B460
|
|
/* 46860 8006B460 27BDFFE0 */ addiu $sp, $sp, -0x20
|
|
/* 46864 8006B464 AFB00010 */ sw $s0, 0x10($sp)
|
|
/* 46868 8006B468 00808021 */ addu $s0, $a0, $zero
|
|
/* 4686C 8006B46C AFB10014 */ sw $s1, 0x14($sp)
|
|
/* 46870 8006B470 00A08821 */ addu $s1, $a1, $zero
|
|
/* 46874 8006B474 3C02A460 */ lui $v0, 0xa460
|
|
/* 46878 8006B478 34420010 */ ori $v0, $v0, 0x10
|
|
/* 4687C 8006B47C AFBF001C */ sw $ra, 0x1c($sp)
|
|
/* 46880 8006B480 AFB20018 */ sw $s2, 0x18($sp)
|
|
/* 46884 8006B484 8C420000 */ lw $v0, ($v0)
|
|
/* 46888 8006B488 00C02021 */ addu $a0, $a2, $zero
|
|
/* 4688C 8006B48C 30420003 */ andi $v0, $v0, 3
|
|
/* 46890 8006B490 10400007 */ beqz $v0, .L8006B4B0
|
|
/* 46894 8006B494 00E09021 */ addu $s2, $a3, $zero
|
|
/* 46898 8006B498 3C03A460 */ lui $v1, 0xa460
|
|
/* 4689C 8006B49C 34630010 */ ori $v1, $v1, 0x10
|
|
.L8006B4A0:
|
|
/* 468A0 8006B4A0 8C620000 */ lw $v0, ($v1)
|
|
/* 468A4 8006B4A4 30420003 */ andi $v0, $v0, 3
|
|
/* 468A8 8006B4A8 1440FFFD */ bnez $v0, .L8006B4A0
|
|
/* 468AC 8006B4AC 00000000 */ nop
|
|
.L8006B4B0:
|
|
/* 468B0 8006B4B0 0C018798 */ jal func_80061E60
|
|
/* 468B4 8006B4B4 00000000 */ nop
|
|
/* 468B8 8006B4B8 3C06A460 */ lui $a2, 0xa460
|
|
/* 468BC 8006B4BC 34C60004 */ ori $a2, $a2, 4
|
|
/* 468C0 8006B4C0 3C051FFF */ lui $a1, 0x1fff
|
|
/* 468C4 8006B4C4 3C038000 */ lui $v1, %hi(D_80000308)
|
|
/* 468C8 8006B4C8 8C630308 */ lw $v1, %lo(D_80000308)($v1)
|
|
/* 468CC 8006B4CC 34A5FFFF */ ori $a1, $a1, 0xffff
|
|
/* 468D0 8006B4D0 3C04A460 */ lui $a0, 0xa460
|
|
/* 468D4 8006B4D4 AC820000 */ sw $v0, ($a0)
|
|
/* 468D8 8006B4D8 00711825 */ or $v1, $v1, $s1
|
|
/* 468DC 8006B4DC 00651824 */ and $v1, $v1, $a1
|
|
/* 468E0 8006B4E0 ACC30000 */ sw $v1, ($a2)
|
|
/* 468E4 8006B4E4 12000005 */ beqz $s0, .L8006B4FC
|
|
/* 468E8 8006B4E8 24020001 */ addiu $v0, $zero, 1
|
|
/* 468EC 8006B4EC 12020006 */ beq $s0, $v0, .L8006B508
|
|
/* 468F0 8006B4F0 3C03A460 */ lui $v1, 0xa460
|
|
/* 468F4 8006B4F4 0801AD46 */ j .L8006B518
|
|
/* 468F8 8006B4F8 2402FFFF */ addiu $v0, $zero, -1
|
|
.L8006B4FC:
|
|
/* 468FC 8006B4FC 3C03A460 */ lui $v1, 0xa460
|
|
/* 46900 8006B500 0801AD43 */ j .L8006B50C
|
|
/* 46904 8006B504 3463000C */ ori $v1, $v1, 0xc
|
|
.L8006B508:
|
|
/* 46908 8006B508 34630008 */ ori $v1, $v1, 8
|
|
.L8006B50C:
|
|
/* 4690C 8006B50C 2642FFFF */ addiu $v0, $s2, -1
|
|
/* 46910 8006B510 AC620000 */ sw $v0, ($v1)
|
|
/* 46914 8006B514 00001021 */ addu $v0, $zero, $zero
|
|
.L8006B518:
|
|
/* 46918 8006B518 8FBF001C */ lw $ra, 0x1c($sp)
|
|
/* 4691C 8006B51C 8FB20018 */ lw $s2, 0x18($sp)
|
|
/* 46920 8006B520 8FB10014 */ lw $s1, 0x14($sp)
|
|
/* 46924 8006B524 8FB00010 */ lw $s0, 0x10($sp)
|
|
/* 46928 8006B528 03E00008 */ jr $ra
|
|
/* 4692C 8006B52C 27BD0020 */ addiu $sp, $sp, 0x20
|