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>
65 lines
3.0 KiB
ArmAsm
65 lines
3.0 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_80048C84
|
|
/* 24084 80048C84 44856000 */ mtc1 $a1, $f12
|
|
/* 24088 80048C88 27BDFFC8 */ addiu $sp, $sp, -0x38
|
|
/* 2408C 80048C8C F7B60020 */ sdc1 $f22, 0x20($sp)
|
|
/* 24090 80048C90 4486B000 */ mtc1 $a2, $f22
|
|
/* 24094 80048C94 44870000 */ mtc1 $a3, $f0
|
|
/* 24098 80048C98 F7B80028 */ sdc1 $f24, 0x28($sp)
|
|
/* 2409C 80048C9C C7B80048 */ lwc1 $f24, 0x48($sp)
|
|
/* 240A0 80048CA0 F7BA0030 */ sdc1 $f26, 0x30($sp)
|
|
/* 240A4 80048CA4 C7BA004C */ lwc1 $f26, 0x4c($sp)
|
|
/* 240A8 80048CA8 AFBF0010 */ sw $ra, 0x10($sp)
|
|
/* 240AC 80048CAC F7B40018 */ sdc1 $f20, 0x18($sp)
|
|
/* 240B0 80048CB0 10800005 */ beqz $a0, .L80048CC8
|
|
/* 240B4 80048CB4 24020001 */ addiu $v0, $zero, 1
|
|
/* 240B8 80048CB8 1082000D */ beq $a0, $v0, .L80048CF0
|
|
/* 240BC 80048CBC 0000102D */ daddu $v0, $zero, $zero
|
|
/* 240C0 80048CC0 08012352 */ j .L80048D48
|
|
/* 240C4 80048CC4 00000000 */ nop
|
|
.L80048CC8:
|
|
/* 240C8 80048CC8 44060000 */ mfc1 $a2, $f0
|
|
/* 240CC 80048CCC 4407C000 */ mfc1 $a3, $f24
|
|
/* 240D0 80048CD0 0C00A7A5 */ jal func_80029E94
|
|
/* 240D4 80048CD4 4600B386 */ mov.s $f14, $f22
|
|
/* 240D8 80048CD8 4600D03C */ c.lt.s $f26, $f0
|
|
/* 240DC 80048CDC 00000000 */ nop
|
|
/* 240E0 80048CE0 45010019 */ bc1t .L80048D48
|
|
/* 240E4 80048CE4 24020001 */ addiu $v0, $zero, 1
|
|
/* 240E8 80048CE8 08012352 */ j .L80048D48
|
|
/* 240EC 80048CEC 0000102D */ daddu $v0, $zero, $zero
|
|
.L80048CF0:
|
|
/* 240F0 80048CF0 4480A000 */ mtc1 $zero, $f20
|
|
/* 240F4 80048CF4 44060000 */ mfc1 $a2, $f0
|
|
/* 240F8 80048CF8 4407A000 */ mfc1 $a3, $f20
|
|
/* 240FC 80048CFC 0C00A7A5 */ jal func_80029E94
|
|
/* 24100 80048D00 4600A386 */ mov.s $f14, $f20
|
|
/* 24104 80048D04 4600A306 */ mov.s $f12, $f20
|
|
/* 24108 80048D08 4600B386 */ mov.s $f14, $f22
|
|
/* 2410C 80048D0C 44066000 */ mfc1 $a2, $f12
|
|
/* 24110 80048D10 4407C000 */ mfc1 $a3, $f24
|
|
/* 24114 80048D14 0C00A7A5 */ jal func_80029E94
|
|
/* 24118 80048D18 46000506 */ mov.s $f20, $f0
|
|
/* 2411C 80048D1C 0000102D */ daddu $v0, $zero, $zero
|
|
/* 24120 80048D20 4614D03C */ c.lt.s $f26, $f20
|
|
/* 24124 80048D24 00000000 */ nop
|
|
/* 24128 80048D28 45010006 */ bc1t .L80048D44
|
|
/* 2412C 80048D2C 46000086 */ mov.s $f2, $f0
|
|
/* 24130 80048D30 C7A00050 */ lwc1 $f0, 0x50($sp)
|
|
/* 24134 80048D34 4602003C */ c.lt.s $f0, $f2
|
|
/* 24138 80048D38 00000000 */ nop
|
|
/* 2413C 80048D3C 45000002 */ bc1f .L80048D48
|
|
/* 24140 80048D40 00000000 */ nop
|
|
.L80048D44:
|
|
/* 24144 80048D44 24020001 */ addiu $v0, $zero, 1
|
|
.L80048D48:
|
|
/* 24148 80048D48 8FBF0010 */ lw $ra, 0x10($sp)
|
|
/* 2414C 80048D4C D7BA0030 */ ldc1 $f26, 0x30($sp)
|
|
/* 24150 80048D50 D7B80028 */ ldc1 $f24, 0x28($sp)
|
|
/* 24154 80048D54 D7B60020 */ ldc1 $f22, 0x20($sp)
|
|
/* 24158 80048D58 D7B40018 */ ldc1 $f20, 0x18($sp)
|
|
/* 2415C 80048D5C 03E00008 */ jr $ra
|
|
/* 24160 80048D60 27BD0038 */ addiu $sp, $sp, 0x38
|