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>
80 lines
3.8 KiB
ArmAsm
80 lines
3.8 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_80029284
|
|
/* 4684 80029284 27BDFFD8 */ addiu $sp, $sp, -0x28
|
|
/* 4688 80029288 AFB3001C */ sw $s3, 0x1c($sp)
|
|
/* 468C 8002928C 0080982D */ daddu $s3, $a0, $zero
|
|
/* 4690 80029290 AFB20018 */ sw $s2, 0x18($sp)
|
|
/* 4694 80029294 00A0902D */ daddu $s2, $a1, $zero
|
|
/* 4698 80029298 AFB10014 */ sw $s1, 0x14($sp)
|
|
/* 469C 8002929C 2651FFF0 */ addiu $s1, $s2, -0x10
|
|
/* 46A0 800292A0 24C6000F */ addiu $a2, $a2, 0xf
|
|
/* 46A4 800292A4 2402FFF0 */ addiu $v0, $zero, -0x10
|
|
/* 46A8 800292A8 AFBF0020 */ sw $ra, 0x20($sp)
|
|
/* 46AC 800292AC AFB00010 */ sw $s0, 0x10($sp)
|
|
/* 46B0 800292B0 9643FFF8 */ lhu $v1, -8($s2)
|
|
/* 46B4 800292B4 10600016 */ beqz $v1, .L80029310
|
|
/* 46B8 800292B8 00C28024 */ and $s0, $a2, $v0
|
|
/* 46BC 800292BC 8E45FFF0 */ lw $a1, -0x10($s2)
|
|
/* 46C0 800292C0 8E44FFF4 */ lw $a0, -0xc($s2)
|
|
/* 46C4 800292C4 00A0182D */ daddu $v1, $a1, $zero
|
|
/* 46C8 800292C8 10600009 */ beqz $v1, .L800292F0
|
|
/* 46CC 800292CC 0090102B */ sltu $v0, $a0, $s0
|
|
/* 46D0 800292D0 94620008 */ lhu $v0, 8($v1)
|
|
/* 46D4 800292D4 14400006 */ bnez $v0, .L800292F0
|
|
/* 46D8 800292D8 0090102B */ sltu $v0, $a0, $s0
|
|
/* 46DC 800292DC 8C650000 */ lw $a1, ($v1)
|
|
/* 46E0 800292E0 8C630004 */ lw $v1, 4($v1)
|
|
/* 46E4 800292E4 24820010 */ addiu $v0, $a0, 0x10
|
|
/* 46E8 800292E8 00432021 */ addu $a0, $v0, $v1
|
|
/* 46EC 800292EC 0090102B */ sltu $v0, $a0, $s0
|
|
.L800292F0:
|
|
/* 46F0 800292F0 10400011 */ beqz $v0, .L80029338
|
|
/* 46F4 800292F4 0220182D */ daddu $v1, $s1, $zero
|
|
/* 46F8 800292F8 0260202D */ daddu $a0, $s3, $zero
|
|
/* 46FC 800292FC 0C00A40B */ jal func_8002902C
|
|
/* 4700 80029300 0200282D */ daddu $a1, $s0, $zero
|
|
/* 4704 80029304 0040882D */ daddu $s1, $v0, $zero
|
|
/* 4708 80029308 16200003 */ bnez $s1, .L80029318
|
|
/* 470C 8002930C 0220202D */ daddu $a0, $s1, $zero
|
|
.L80029310:
|
|
/* 4710 80029310 0800A4DE */ j .L80029378
|
|
/* 4714 80029314 0000102D */ daddu $v0, $zero, $zero
|
|
.L80029318:
|
|
/* 4718 80029318 0240282D */ daddu $a1, $s2, $zero
|
|
/* 471C 8002931C 0C019291 */ jal func_80064A44
|
|
/* 4720 80029320 0200302D */ daddu $a2, $s0, $zero
|
|
/* 4724 80029324 0260202D */ daddu $a0, $s3, $zero
|
|
/* 4728 80029328 0C00A477 */ jal func_800291DC
|
|
/* 472C 8002932C 0240282D */ daddu $a1, $s2, $zero
|
|
/* 4730 80029330 0800A4DE */ j .L80029378
|
|
/* 4734 80029334 0220102D */ daddu $v0, $s1, $zero
|
|
.L80029338:
|
|
/* 4738 80029338 26020010 */ addiu $v0, $s0, 0x10
|
|
/* 473C 8002933C 0044102B */ sltu $v0, $v0, $a0
|
|
/* 4740 80029340 1040000A */ beqz $v0, .L8002936C
|
|
/* 4744 80029344 02501021 */ addu $v0, $s2, $s0
|
|
/* 4748 80029348 AC620000 */ sw $v0, ($v1)
|
|
/* 474C 8002934C AC700004 */ sw $s0, 4($v1)
|
|
/* 4750 80029350 0040182D */ daddu $v1, $v0, $zero
|
|
/* 4754 80029354 00901023 */ subu $v0, $a0, $s0
|
|
/* 4758 80029358 2442FFF0 */ addiu $v0, $v0, -0x10
|
|
/* 475C 8002935C AC650000 */ sw $a1, ($v1)
|
|
/* 4760 80029360 AC620004 */ sw $v0, 4($v1)
|
|
/* 4764 80029364 0800A4DD */ j .L80029374
|
|
/* 4768 80029368 A4600008 */ sh $zero, 8($v1)
|
|
.L8002936C:
|
|
/* 476C 8002936C AC650000 */ sw $a1, ($v1)
|
|
/* 4770 80029370 AC640004 */ sw $a0, 4($v1)
|
|
.L80029374:
|
|
/* 4774 80029374 0240102D */ daddu $v0, $s2, $zero
|
|
.L80029378:
|
|
/* 4778 80029378 8FBF0020 */ lw $ra, 0x20($sp)
|
|
/* 477C 8002937C 8FB3001C */ lw $s3, 0x1c($sp)
|
|
/* 4780 80029380 8FB20018 */ lw $s2, 0x18($sp)
|
|
/* 4784 80029384 8FB10014 */ lw $s1, 0x14($sp)
|
|
/* 4788 80029388 8FB00010 */ lw $s0, 0x10($sp)
|
|
/* 478C 8002938C 03E00008 */ jr $ra
|
|
/* 4790 80029390 27BD0028 */ addiu $sp, $sp, 0x28
|