mirror of
https://github.com/pmret/papermario.git
synced 2024-11-19 09:22:30 +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>
25 lines
1.0 KiB
ArmAsm
25 lines
1.0 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_8006B154
|
|
/* 46554 8006B154 0080C821 */ addu $t9, $a0, $zero
|
|
/* 46558 8006B158 8C980000 */ lw $t8, ($a0)
|
|
/* 4655C 8006B15C 8CAF0004 */ lw $t7, 4($a1)
|
|
/* 46560 8006B160 8F0E0004 */ lw $t6, 4($t8)
|
|
/* 46564 8006B164 01CF082A */ slt $at, $t6, $t7
|
|
/* 46568 8006B168 14200007 */ bnez $at, .L8006B188
|
|
/* 4656C 8006B16C 00000000 */ nop
|
|
.L8006B170:
|
|
/* 46570 8006B170 0300C821 */ addu $t9, $t8, $zero
|
|
/* 46574 8006B174 8F180000 */ lw $t8, ($t8)
|
|
/* 46578 8006B178 8F0E0004 */ lw $t6, 4($t8)
|
|
/* 4657C 8006B17C 01CF082A */ slt $at, $t6, $t7
|
|
/* 46580 8006B180 1020FFFB */ beqz $at, .L8006B170
|
|
/* 46584 8006B184 00000000 */ nop
|
|
.L8006B188:
|
|
/* 46588 8006B188 8F380000 */ lw $t8, ($t9)
|
|
/* 4658C 8006B18C ACB80000 */ sw $t8, ($a1)
|
|
/* 46590 8006B190 AF250000 */ sw $a1, ($t9)
|
|
/* 46594 8006B194 03E00008 */ jr $ra
|
|
/* 46598 8006B198 ACA40008 */ sw $a0, 8($a1)
|