mirror of
https://github.com/pmret/papermario.git
synced 2024-09-20 08:21:48 +02: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>
57 lines
2.7 KiB
ArmAsm
57 lines
2.7 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_80240034_ED8E54
|
|
/* ED8E54 80240034 3C038017 */ lui $v1, %hi(D_80169B12)
|
|
/* ED8E58 80240038 84639B12 */ lh $v1, %lo(D_80169B12)($v1)
|
|
/* ED8E5C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18
|
|
/* ED8E60 80240040 AFB00010 */ sw $s0, 0x10($sp)
|
|
/* ED8E64 80240044 0080802D */ daddu $s0, $a0, $zero
|
|
/* ED8E68 80240048 AFBF0014 */ sw $ra, 0x14($sp)
|
|
/* ED8E6C 8024004C 8E0200B0 */ lw $v0, 0xb0($s0)
|
|
/* ED8E70 80240050 10620003 */ beq $v1, $v0, .L80240060
|
|
/* ED8E74 80240054 24020002 */ addiu $v0, $zero, 2
|
|
/* ED8E78 80240058 08090038 */ j .L802400E0
|
|
/* ED8E7C 8024005C AE000084 */ sw $zero, 0x84($s0)
|
|
.L80240060:
|
|
/* ED8E80 80240060 3C038008 */ lui $v1, %hi(D_80079430)
|
|
/* ED8E84 80240064 8C639430 */ lw $v1, %lo(D_80079430)($v1)
|
|
/* ED8E88 80240068 80620040 */ lb $v0, 0x40($v1)
|
|
/* ED8E8C 8024006C 80670044 */ lb $a3, 0x44($v1)
|
|
/* ED8E90 80240070 04420001 */ bltzl $v0, .L80240078
|
|
/* ED8E94 80240074 00021023 */ negu $v0, $v0
|
|
.L80240078:
|
|
/* ED8E98 80240078 14400003 */ bnez $v0, .L80240088
|
|
/* ED8E9C 8024007C 00000000 */ nop
|
|
/* ED8EA0 80240080 50E00017 */ beql $a3, $zero, .L802400E0
|
|
/* ED8EA4 80240084 0000102D */ daddu $v0, $zero, $zero
|
|
.L80240088:
|
|
/* ED8EA8 80240088 44822000 */ mtc1 $v0, $f4
|
|
/* ED8EAC 8024008C 00000000 */ nop
|
|
/* ED8EB0 80240090 46802120 */ cvt.s.w $f4, $f4
|
|
/* ED8EB4 80240094 44062000 */ mfc1 $a2, $f4
|
|
/* ED8EB8 80240098 44872000 */ mtc1 $a3, $f4
|
|
/* ED8EBC 8024009C 00000000 */ nop
|
|
/* ED8EC0 802400A0 46802120 */ cvt.s.w $f4, $f4
|
|
/* ED8EC4 802400A4 44806000 */ mtc1 $zero, $f12
|
|
/* ED8EC8 802400A8 44072000 */ mfc1 $a3, $f4
|
|
/* ED8ECC 802400AC 0C00ABDC */ jal fio_validate_header_checksums
|
|
/* ED8ED0 802400B0 46006386 */ mov.s $f14, $f12
|
|
/* ED8ED4 802400B4 3C014270 */ lui $at, 0x4270
|
|
/* ED8ED8 802400B8 44811000 */ mtc1 $at, $f2
|
|
/* ED8EDC 802400BC 00000000 */ nop
|
|
/* ED8EE0 802400C0 4602003C */ c.lt.s $f0, $f2
|
|
/* ED8EE4 802400C4 00000000 */ nop
|
|
/* ED8EE8 802400C8 45000004 */ bc1f .L802400DC
|
|
/* ED8EEC 802400CC 24020001 */ addiu $v0, $zero, 1
|
|
/* ED8EF0 802400D0 AE020084 */ sw $v0, 0x84($s0)
|
|
/* ED8EF4 802400D4 08090038 */ j .L802400E0
|
|
/* ED8EF8 802400D8 24020002 */ addiu $v0, $zero, 2
|
|
.L802400DC:
|
|
/* ED8EFC 802400DC 0000102D */ daddu $v0, $zero, $zero
|
|
.L802400E0:
|
|
/* ED8F00 802400E0 8FBF0014 */ lw $ra, 0x14($sp)
|
|
/* ED8F04 802400E4 8FB00010 */ lw $s0, 0x10($sp)
|
|
/* ED8F08 802400E8 03E00008 */ jr $ra
|
|
/* ED8F0C 802400EC 27BD0018 */ addiu $sp, $sp, 0x18
|