mirror of
https://github.com/pmret/papermario.git
synced 2024-11-14 23:13:10 +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>
36 lines
1.8 KiB
ArmAsm
36 lines
1.8 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_80047A30
|
|
/* 22E30 80047A30 27BDFFE0 */ addiu $sp, $sp, -0x20
|
|
/* 22E34 80047A34 0080302D */ daddu $a2, $a0, $zero
|
|
/* 22E38 80047A38 AFB10014 */ sw $s1, 0x14($sp)
|
|
/* 22E3C 80047A3C 00A0882D */ daddu $s1, $a1, $zero
|
|
/* 22E40 80047A40 00061040 */ sll $v0, $a2, 1
|
|
/* 22E44 80047A44 00461021 */ addu $v0, $v0, $a2
|
|
/* 22E48 80047A48 00021080 */ sll $v0, $v0, 2
|
|
/* 22E4C 80047A4C 00461023 */ subu $v0, $v0, $a2
|
|
/* 22E50 80047A50 3C03800A */ lui $v1, %hi(D_800A0F44)
|
|
/* 22E54 80047A54 8C630F44 */ lw $v1, %lo(D_800A0F44)($v1)
|
|
/* 22E58 80047A58 00021100 */ sll $v0, $v0, 4
|
|
/* 22E5C 80047A5C AFBF0018 */ sw $ra, 0x18($sp)
|
|
/* 22E60 80047A60 AFB00010 */ sw $s0, 0x10($sp)
|
|
/* 22E64 80047A64 00628021 */ addu $s0, $v1, $v0
|
|
/* 22E68 80047A68 2403FFEF */ addiu $v1, $zero, -0x11
|
|
/* 22E6C 80047A6C 8E020000 */ lw $v0, ($s0)
|
|
/* 22E70 80047A70 82040058 */ lb $a0, 0x58($s0)
|
|
/* 22E74 80047A74 00431024 */ and $v0, $v0, $v1
|
|
/* 22E78 80047A78 10910006 */ beq $a0, $s1, .L80047A94
|
|
/* 22E7C 80047A7C AE020000 */ sw $v0, ($s0)
|
|
/* 22E80 80047A80 0C011EAA */ jal func_80047AA8
|
|
/* 22E84 80047A84 00C0202D */ daddu $a0, $a2, $zero
|
|
/* 22E88 80047A88 24020001 */ addiu $v0, $zero, 1
|
|
/* 22E8C 80047A8C A2110058 */ sb $s1, 0x58($s0)
|
|
/* 22E90 80047A90 A202005A */ sb $v0, 0x5a($s0)
|
|
.L80047A94:
|
|
/* 22E94 80047A94 8FBF0018 */ lw $ra, 0x18($sp)
|
|
/* 22E98 80047A98 8FB10014 */ lw $s1, 0x14($sp)
|
|
/* 22E9C 80047A9C 8FB00010 */ lw $s0, 0x10($sp)
|
|
/* 22EA0 80047AA0 03E00008 */ jr $ra
|
|
/* 22EA4 80047AA4 27BD0020 */ addiu $sp, $sp, 0x20
|