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>
107 lines
5.3 KiB
ArmAsm
107 lines
5.3 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_8002B114
|
|
/* 6514 8002B114 27BDFFD8 */ addiu $sp, $sp, -0x28
|
|
/* 6518 8002B118 AFB20018 */ sw $s2, 0x18($sp)
|
|
/* 651C 8002B11C 3C12800A */ lui $s2, %hi(D_8009A690)
|
|
/* 6520 8002B120 2652A690 */ addiu $s2, $s2, %lo(D_8009A690)
|
|
/* 6524 8002B124 AFB40020 */ sw $s4, 0x20($sp)
|
|
/* 6528 8002B128 0240A02D */ daddu $s4, $s2, $zero
|
|
/* 652C 8002B12C AFB00010 */ sw $s0, 0x10($sp)
|
|
/* 6530 8002B130 0000802D */ daddu $s0, $zero, $zero
|
|
/* 6534 8002B134 2404FFFF */ addiu $a0, $zero, -1
|
|
/* 6538 8002B138 3C03800A */ lui $v1, %hi(D_8009BA10)
|
|
/* 653C 8002B13C 2463BA10 */ addiu $v1, $v1, %lo(D_8009BA10)
|
|
/* 6540 8002B140 AFBF0024 */ sw $ra, 0x24($sp)
|
|
/* 6544 8002B144 AFB3001C */ sw $s3, 0x1c($sp)
|
|
/* 6548 8002B148 AFB10014 */ sw $s1, 0x14($sp)
|
|
.L8002B14C:
|
|
/* 654C 8002B14C AC640000 */ sw $a0, ($v1)
|
|
/* 6550 8002B150 AC640004 */ sw $a0, 4($v1)
|
|
/* 6554 8002B154 26100001 */ addiu $s0, $s0, 1
|
|
/* 6558 8002B158 2A020004 */ slti $v0, $s0, 4
|
|
/* 655C 8002B15C 1440FFFB */ bnez $v0, .L8002B14C
|
|
/* 6560 8002B160 24630008 */ addiu $v1, $v1, 8
|
|
/* 6564 8002B164 0000802D */ daddu $s0, $zero, $zero
|
|
/* 6568 8002B168 3C13800A */ lui $s3, %hi(D_8009BA10)
|
|
/* 656C 8002B16C 2673BA10 */ addiu $s3, $s3, %lo(D_8009BA10)
|
|
/* 6570 8002B170 3C11800A */ lui $s1, %hi(D_8009BA30)
|
|
/* 6574 8002B174 2631BA30 */ addiu $s1, $s1, %lo(D_8009BA30)
|
|
.L8002B178:
|
|
/* 6578 8002B178 0200202D */ daddu $a0, $s0, $zero
|
|
/* 657C 8002B17C 0280282D */ daddu $a1, $s4, $zero
|
|
/* 6580 8002B180 0C00AE0A */ jal func_8002B828
|
|
/* 6584 8002B184 24061380 */ addiu $a2, $zero, 0x1380
|
|
/* 6588 8002B188 0C00AC2E */ jal func_8002B0B8
|
|
/* 658C 8002B18C 0280202D */ daddu $a0, $s4, $zero
|
|
/* 6590 8002B190 50400014 */ beql $v0, $zero, .L8002B1E4
|
|
/* 6594 8002B194 26100001 */ addiu $s0, $s0, 1
|
|
/* 6598 8002B198 8E420038 */ lw $v0, 0x38($s2)
|
|
/* 659C 8002B19C AE220000 */ sw $v0, ($s1)
|
|
/* 65A0 8002B1A0 8E42003C */ lw $v0, 0x3c($s2)
|
|
/* 65A4 8002B1A4 AE220004 */ sw $v0, 4($s1)
|
|
/* 65A8 8002B1A8 8E420038 */ lw $v0, 0x38($s2)
|
|
/* 65AC 8002B1AC 8E43003C */ lw $v1, 0x3c($s2)
|
|
/* 65B0 8002B1B0 000210C0 */ sll $v0, $v0, 3
|
|
/* 65B4 8002B1B4 00532021 */ addu $a0, $v0, $s3
|
|
/* 65B8 8002B1B8 8C820004 */ lw $v0, 4($a0)
|
|
/* 65BC 8002B1BC 0043102A */ slt $v0, $v0, $v1
|
|
/* 65C0 8002B1C0 50400008 */ beql $v0, $zero, .L8002B1E4
|
|
/* 65C4 8002B1C4 26100001 */ addiu $s0, $s0, 1
|
|
/* 65C8 8002B1C8 AC900000 */ sw $s0, ($a0)
|
|
/* 65CC 8002B1CC 8E420038 */ lw $v0, 0x38($s2)
|
|
/* 65D0 8002B1D0 8E43003C */ lw $v1, 0x3c($s2)
|
|
/* 65D4 8002B1D4 000210C0 */ sll $v0, $v0, 3
|
|
/* 65D8 8002B1D8 00531021 */ addu $v0, $v0, $s3
|
|
/* 65DC 8002B1DC AC430004 */ sw $v1, 4($v0)
|
|
/* 65E0 8002B1E0 26100001 */ addiu $s0, $s0, 1
|
|
.L8002B1E4:
|
|
/* 65E4 8002B1E4 2A020006 */ slti $v0, $s0, 6
|
|
/* 65E8 8002B1E8 1440FFE3 */ bnez $v0, .L8002B178
|
|
/* 65EC 8002B1EC 26310008 */ addiu $s1, $s1, 8
|
|
/* 65F0 8002B1F0 3C067FFF */ lui $a2, 0x7fff
|
|
/* 65F4 8002B1F4 34C6FFFF */ ori $a2, $a2, 0xffff
|
|
/* 65F8 8002B1F8 0000202D */ daddu $a0, $zero, $zero
|
|
/* 65FC 8002B1FC 3C09800A */ lui $t1, %hi(D_8009BA10)
|
|
/* 6600 8002B200 2529BA10 */ addiu $t1, $t1, %lo(D_8009BA10)
|
|
/* 6604 8002B204 24080004 */ addiu $t0, $zero, 4
|
|
/* 6608 8002B208 3C07800A */ lui $a3, %hi(D_8009BA60)
|
|
/* 660C 8002B20C 24E7BA60 */ addiu $a3, $a3, %lo(D_8009BA60)
|
|
/* 6610 8002B210 3C05800A */ lui $a1, %hi(D_8009BA30)
|
|
/* 6614 8002B214 24A5BA30 */ addiu $a1, $a1, %lo(D_8009BA30)
|
|
.L8002B218:
|
|
/* 6618 8002B218 0000802D */ daddu $s0, $zero, $zero
|
|
/* 661C 8002B21C 0120182D */ daddu $v1, $t1, $zero
|
|
.L8002B220:
|
|
/* 6620 8002B220 8C620000 */ lw $v0, ($v1)
|
|
/* 6624 8002B224 10820005 */ beq $a0, $v0, .L8002B23C
|
|
/* 6628 8002B228 00000000 */ nop
|
|
/* 662C 8002B22C 26100001 */ addiu $s0, $s0, 1
|
|
/* 6630 8002B230 2A020004 */ slti $v0, $s0, 4
|
|
/* 6634 8002B234 1440FFFA */ bnez $v0, .L8002B220
|
|
/* 6638 8002B238 24630008 */ addiu $v1, $v1, 8
|
|
.L8002B23C:
|
|
/* 663C 8002B23C 56080008 */ bnel $s0, $t0, .L8002B260
|
|
/* 6640 8002B240 24840001 */ addiu $a0, $a0, 1
|
|
/* 6644 8002B244 8CA30004 */ lw $v1, 4($a1)
|
|
/* 6648 8002B248 0066102A */ slt $v0, $v1, $a2
|
|
/* 664C 8002B24C 50400004 */ beql $v0, $zero, .L8002B260
|
|
/* 6650 8002B250 24840001 */ addiu $a0, $a0, 1
|
|
/* 6654 8002B254 0060302D */ daddu $a2, $v1, $zero
|
|
/* 6658 8002B258 ACE40000 */ sw $a0, ($a3)
|
|
/* 665C 8002B25C 24840001 */ addiu $a0, $a0, 1
|
|
.L8002B260:
|
|
/* 6660 8002B260 28820006 */ slti $v0, $a0, 6
|
|
/* 6664 8002B264 1440FFEC */ bnez $v0, .L8002B218
|
|
/* 6668 8002B268 24A50008 */ addiu $a1, $a1, 8
|
|
/* 666C 8002B26C 8FBF0024 */ lw $ra, 0x24($sp)
|
|
/* 6670 8002B270 8FB40020 */ lw $s4, 0x20($sp)
|
|
/* 6674 8002B274 8FB3001C */ lw $s3, 0x1c($sp)
|
|
/* 6678 8002B278 8FB20018 */ lw $s2, 0x18($sp)
|
|
/* 667C 8002B27C 8FB10014 */ lw $s1, 0x14($sp)
|
|
/* 6680 8002B280 8FB00010 */ lw $s0, 0x10($sp)
|
|
/* 6684 8002B284 24020001 */ addiu $v0, $zero, 1
|
|
/* 6688 8002B288 03E00008 */ jr $ra
|
|
/* 668C 8002B28C 27BD0028 */ addiu $sp, $sp, 0x28
|