mirror of
https://github.com/pmret/papermario.git
synced 2024-11-18 17:02:46 +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>
41 lines
1.7 KiB
ArmAsm
41 lines
1.7 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_80061820
|
|
/* 3CC20 80061820 18A00011 */ blez $a1, .L80061868
|
|
/* 3CC24 80061824 00000000 */ nop
|
|
/* 3CC28 80061828 240B2000 */ addiu $t3, $zero, 0x2000
|
|
/* 3CC2C 8006182C 00AB082B */ sltu $at, $a1, $t3
|
|
/* 3CC30 80061830 1020000F */ beqz $at, .L80061870
|
|
/* 3CC34 80061834 00000000 */ nop
|
|
/* 3CC38 80061838 00804021 */ addu $t0, $a0, $zero
|
|
/* 3CC3C 8006183C 00854821 */ addu $t1, $a0, $a1
|
|
/* 3CC40 80061840 0109082B */ sltu $at, $t0, $t1
|
|
/* 3CC44 80061844 10200008 */ beqz $at, .L80061868
|
|
/* 3CC48 80061848 00000000 */ nop
|
|
/* 3CC4C 8006184C 2529FFF0 */ addiu $t1, $t1, -0x10
|
|
/* 3CC50 80061850 310A000F */ andi $t2, $t0, 0xf
|
|
/* 3CC54 80061854 010A4023 */ subu $t0, $t0, $t2
|
|
.L80061858:
|
|
/* 3CC58 80061858 BD190000 */ cache 0x19, ($t0)
|
|
/* 3CC5C 8006185C 0109082B */ sltu $at, $t0, $t1
|
|
/* 3CC60 80061860 1420FFFD */ bnez $at, .L80061858
|
|
/* 3CC64 80061864 25080010 */ addiu $t0, $t0, 0x10
|
|
.L80061868:
|
|
/* 3CC68 80061868 03E00008 */ jr $ra
|
|
/* 3CC6C 8006186C 00000000 */ nop
|
|
.L80061870:
|
|
/* 3CC70 80061870 3C088000 */ lui $t0, 0x8000
|
|
/* 3CC74 80061874 010B4821 */ addu $t1, $t0, $t3
|
|
/* 3CC78 80061878 2529FFF0 */ addiu $t1, $t1, -0x10
|
|
.L8006187C:
|
|
/* 3CC7C 8006187C BD010000 */ cache 1, ($t0)
|
|
/* 3CC80 80061880 0109082B */ sltu $at, $t0, $t1
|
|
/* 3CC84 80061884 1420FFFD */ bnez $at, .L8006187C
|
|
/* 3CC88 80061888 25080010 */ addiu $t0, $t0, 0x10
|
|
/* 3CC8C 8006188C 03E00008 */ jr $ra
|
|
/* 3CC90 80061890 00000000 */ nop
|
|
/* 3CC94 80061894 00000000 */ nop
|
|
/* 3CC98 80061898 00000000 */ nop
|
|
/* 3CC9C 8006189C 00000000 */ nop
|