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>
102 lines
4.9 KiB
ArmAsm
102 lines
4.9 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_8005A214
|
|
/* 35614 8005A214 27BDFFD8 */ addiu $sp, $sp, -0x28
|
|
/* 35618 8005A218 AFB20020 */ sw $s2, 0x20($sp)
|
|
/* 3561C 8005A21C 0080902D */ daddu $s2, $a0, $zero
|
|
/* 35620 8005A220 3C038008 */ lui $v1, %hi(D_8007F1E0)
|
|
/* 35624 8005A224 2463F1E0 */ addiu $v1, $v1, %lo(D_8007F1E0)
|
|
/* 35628 8005A228 00121040 */ sll $v0, $s2, 1
|
|
/* 3562C 8005A22C 00521021 */ addu $v0, $v0, $s2
|
|
/* 35630 8005A230 000210C0 */ sll $v0, $v0, 3
|
|
/* 35634 8005A234 AFB1001C */ sw $s1, 0x1c($sp)
|
|
/* 35638 8005A238 00438821 */ addu $s1, $v0, $v1
|
|
/* 3563C 8005A23C 0000202D */ daddu $a0, $zero, $zero
|
|
/* 35640 8005A240 AFB00018 */ sw $s0, 0x18($sp)
|
|
/* 35644 8005A244 3C10800A */ lui $s0, %hi(D_800A1E10)
|
|
/* 35648 8005A248 26101E10 */ addiu $s0, $s0, %lo(D_800A1E10)
|
|
/* 3564C 8005A24C AFBF0024 */ sw $ra, 0x24($sp)
|
|
.L8005A250:
|
|
/* 35650 8005A250 8E020000 */ lw $v0, ($s0)
|
|
/* 35654 8005A254 30420001 */ andi $v0, $v0, 1
|
|
/* 35658 8005A258 50400005 */ beql $v0, $zero, .L8005A270
|
|
/* 3565C 8005A25C 24840001 */ addiu $a0, $a0, 1
|
|
/* 35660 8005A260 8E020004 */ lw $v0, 4($s0)
|
|
/* 35664 8005A264 10520006 */ beq $v0, $s2, .L8005A280
|
|
/* 35668 8005A268 2882000F */ slti $v0, $a0, 0xf
|
|
/* 3566C 8005A26C 24840001 */ addiu $a0, $a0, 1
|
|
.L8005A270:
|
|
/* 35670 8005A270 2882000F */ slti $v0, $a0, 0xf
|
|
/* 35674 8005A274 1440FFF6 */ bnez $v0, .L8005A250
|
|
/* 35678 8005A278 26100020 */ addiu $s0, $s0, 0x20
|
|
/* 3567C 8005A27C 2882000F */ slti $v0, $a0, 0xf
|
|
.L8005A280:
|
|
/* 35680 8005A280 14400030 */ bnez $v0, .L8005A344
|
|
/* 35684 8005A284 24020001 */ addiu $v0, $zero, 1
|
|
/* 35688 8005A288 0000202D */ daddu $a0, $zero, $zero
|
|
/* 3568C 8005A28C 3C10800A */ lui $s0, %hi(D_800A1E10)
|
|
/* 35690 8005A290 26101E10 */ addiu $s0, $s0, %lo(D_800A1E10)
|
|
.L8005A294:
|
|
/* 35694 8005A294 8E020000 */ lw $v0, ($s0)
|
|
/* 35698 8005A298 30420001 */ andi $v0, $v0, 1
|
|
/* 3569C 8005A29C 10400006 */ beqz $v0, .L8005A2B8
|
|
/* 356A0 8005A2A0 2882000F */ slti $v0, $a0, 0xf
|
|
/* 356A4 8005A2A4 24840001 */ addiu $a0, $a0, 1
|
|
/* 356A8 8005A2A8 2882000F */ slti $v0, $a0, 0xf
|
|
/* 356AC 8005A2AC 1440FFF9 */ bnez $v0, .L8005A294
|
|
/* 356B0 8005A2B0 26100020 */ addiu $s0, $s0, 0x20
|
|
/* 356B4 8005A2B4 2882000F */ slti $v0, $a0, 0xf
|
|
.L8005A2B8:
|
|
/* 356B8 8005A2B8 14400003 */ bnez $v0, .L8005A2C8
|
|
/* 356BC 8005A2BC 3C0700FF */ lui $a3, 0xff
|
|
.L8005A2C0:
|
|
/* 356C0 8005A2C0 080168B0 */ j .L8005A2C0
|
|
/* 356C4 8005A2C4 00000000 */ nop
|
|
.L8005A2C8:
|
|
/* 356C8 8005A2C8 34E7FFFF */ ori $a3, $a3, 0xffff
|
|
/* 356CC 8005A2CC 0000282D */ daddu $a1, $zero, $zero
|
|
/* 356D0 8005A2D0 2402FFFF */ addiu $v0, $zero, -1
|
|
/* 356D4 8005A2D4 3C038019 */ lui $v1, %hi(D_80197000)
|
|
/* 356D8 8005A2D8 24637000 */ addiu $v1, $v1, %lo(D_80197000)
|
|
/* 356DC 8005A2DC AFA20010 */ sw $v0, 0x10($sp)
|
|
/* 356E0 8005A2E0 AFA20014 */ sw $v0, 0x14($sp)
|
|
/* 356E4 8005A2E4 00041300 */ sll $v0, $a0, 0xc
|
|
/* 356E8 8005A2E8 00431021 */ addu $v0, $v0, $v1
|
|
/* 356EC 8005A2EC 8E26000C */ lw $a2, 0xc($s1)
|
|
/* 356F0 8005A2F0 0C0199DC */ jal func_80066770
|
|
/* 356F4 8005A2F4 00473824 */ and $a3, $v0, $a3
|
|
/* 356F8 8005A2F8 8E240004 */ lw $a0, 4($s1)
|
|
/* 356FC 8005A2FC 8E250008 */ lw $a1, 8($s1)
|
|
/* 35700 8005A300 0C00A5BF */ jal func_800296FC
|
|
/* 35704 8005A304 8E26000C */ lw $a2, 0xc($s1)
|
|
/* 35708 8005A308 8E220010 */ lw $v0, 0x10($s1)
|
|
/* 3570C 8005A30C 5040000D */ beql $v0, $zero, .L8005A344
|
|
/* 35710 8005A310 24020001 */ addiu $v0, $zero, 1
|
|
/* 35714 8005A314 8E240014 */ lw $a0, 0x14($s1)
|
|
/* 35718 8005A318 0C00AAFA */ jal func_8002ABE8
|
|
/* 3571C 8005A31C 00822023 */ subu $a0, $a0, $v0
|
|
/* 35720 8005A320 14400003 */ bnez $v0, .L8005A330
|
|
/* 35724 8005A324 AE02001C */ sw $v0, 0x1c($s0)
|
|
.L8005A328:
|
|
/* 35728 8005A328 080168CA */ j .L8005A328
|
|
/* 3572C 8005A32C 00000000 */ nop
|
|
.L8005A330:
|
|
/* 35730 8005A330 8E240010 */ lw $a0, 0x10($s1)
|
|
/* 35734 8005A334 8E250014 */ lw $a1, 0x14($s1)
|
|
/* 35738 8005A338 0C00A5BF */ jal func_800296FC
|
|
/* 3573C 8005A33C 8E06001C */ lw $a2, 0x1c($s0)
|
|
/* 35740 8005A340 24020001 */ addiu $v0, $zero, 1
|
|
.L8005A344:
|
|
/* 35744 8005A344 0040182D */ daddu $v1, $v0, $zero
|
|
/* 35748 8005A348 AE120004 */ sw $s2, 4($s0)
|
|
/* 3574C 8005A34C AE000008 */ sw $zero, 8($s0)
|
|
/* 35750 8005A350 AE030000 */ sw $v1, ($s0)
|
|
/* 35754 8005A354 8FBF0024 */ lw $ra, 0x24($sp)
|
|
/* 35758 8005A358 8FB20020 */ lw $s2, 0x20($sp)
|
|
/* 3575C 8005A35C 8FB1001C */ lw $s1, 0x1c($sp)
|
|
/* 35760 8005A360 8FB00018 */ lw $s0, 0x18($sp)
|
|
/* 35764 8005A364 03E00008 */ jr $ra
|
|
/* 35768 8005A368 27BD0028 */ addiu $sp, $sp, 0x28
|
|
/* 3576C 8005A36C 00000000 */ nop
|