mirror of
https://github.com/pmret/papermario.git
synced 2024-11-19 01:12:28 +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>
42 lines
2.1 KiB
ArmAsm
42 lines
2.1 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_80047E1C
|
|
/* 2321C 80047E1C 27BDFFE0 */ addiu $sp, $sp, -0x20
|
|
/* 23220 80047E20 00041040 */ sll $v0, $a0, 1
|
|
/* 23224 80047E24 00441021 */ addu $v0, $v0, $a0
|
|
/* 23228 80047E28 00021080 */ sll $v0, $v0, 2
|
|
/* 2322C 80047E2C 00441023 */ subu $v0, $v0, $a0
|
|
/* 23230 80047E30 3C03800A */ lui $v1, %hi(D_8009ED54)
|
|
/* 23234 80047E34 8C63ED54 */ lw $v1, %lo(D_8009ED54)($v1)
|
|
/* 23238 80047E38 00021100 */ sll $v0, $v0, 4
|
|
/* 2323C 80047E3C AFBF0018 */ sw $ra, 0x18($sp)
|
|
/* 23240 80047E40 AFB10014 */ sw $s1, 0x14($sp)
|
|
/* 23244 80047E44 AFB00010 */ sw $s0, 0x10($sp)
|
|
/* 23248 80047E48 00628821 */ addu $s1, $v1, $v0
|
|
/* 2324C 80047E4C 2403F7FF */ addiu $v1, $zero, -0x801
|
|
/* 23250 80047E50 8E220000 */ lw $v0, ($s1)
|
|
/* 23254 80047E54 822400A8 */ lb $a0, 0xa8($s1)
|
|
/* 23258 80047E58 00431024 */ and $v0, $v0, $v1
|
|
/* 2325C 80047E5C 1480000E */ bnez $a0, .L80047E98
|
|
/* 23260 80047E60 AE220000 */ sw $v0, ($s1)
|
|
/* 23264 80047E64 3C048011 */ lui $a0, %hi(D_80108BA4)
|
|
/* 23268 80047E68 24848BA4 */ addiu $a0, $a0, %lo(D_80108BA4)
|
|
/* 2326C 80047E6C 24020001 */ addiu $v0, $zero, 1
|
|
/* 23270 80047E70 0C051955 */ jal func_80146554
|
|
/* 23274 80047E74 A22200A8 */ sb $v0, 0xa8($s1)
|
|
/* 23278 80047E78 0040802D */ daddu $s0, $v0, $zero
|
|
/* 2327C 80047E7C 0200202D */ daddu $a0, $s0, $zero
|
|
/* 23280 80047E80 0C0526AC */ jal func_80149AB0
|
|
/* 23284 80047E84 24050002 */ addiu $a1, $zero, 2
|
|
/* 23288 80047E88 0200202D */ daddu $a0, $s0, $zero
|
|
/* 2328C 80047E8C 0C0526AC */ jal func_80149AB0
|
|
/* 23290 80047E90 24050080 */ addiu $a1, $zero, 0x80
|
|
/* 23294 80047E94 AE3000AC */ sw $s0, 0xac($s1)
|
|
.L80047E98:
|
|
/* 23298 80047E98 8FBF0018 */ lw $ra, 0x18($sp)
|
|
/* 2329C 80047E9C 8FB10014 */ lw $s1, 0x14($sp)
|
|
/* 232A0 80047EA0 8FB00010 */ lw $s0, 0x10($sp)
|
|
/* 232A4 80047EA4 03E00008 */ jr $ra
|
|
/* 232A8 80047EA8 27BD0020 */ addiu $sp, $sp, 0x20
|