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>
30 lines
1.4 KiB
ArmAsm
30 lines
1.4 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_80054934
|
|
/* 2FD34 80054934 27BDFFE8 */ addiu $sp, $sp, -0x18
|
|
/* 2FD38 80054938 0080182D */ daddu $v1, $a0, $zero
|
|
/* 2FD3C 8005493C 00A0202D */ daddu $a0, $a1, $zero
|
|
/* 2FD40 80054940 3C02800A */ lui $v0, %hi(D_8009A5A0)
|
|
/* 2FD44 80054944 8C42A5A0 */ lw $v0, %lo(D_8009A5A0)($v0)
|
|
/* 2FD48 80054948 AFBF0014 */ sw $ra, 0x14($sp)
|
|
/* 2FD4C 8005494C AFB00010 */ sw $s0, 0x10($sp)
|
|
/* 2FD50 80054950 8C500004 */ lw $s0, 4($v0)
|
|
/* 2FD54 80054954 0C0150FD */ jal func_800543F4
|
|
/* 2FD58 80054958 0060282D */ daddu $a1, $v1, $zero
|
|
/* 2FD5C 8005495C 0040182D */ daddu $v1, $v0, $zero
|
|
/* 2FD60 80054960 10600007 */ beqz $v1, .L80054980
|
|
/* 2FD64 80054964 00000000 */ nop
|
|
/* 2FD68 80054968 0000202D */ daddu $a0, $zero, $zero
|
|
.L8005496C:
|
|
/* 2FD6C 8005496C AC700000 */ sw $s0, ($v1)
|
|
/* 2FD70 80054970 24840001 */ addiu $a0, $a0, 1
|
|
/* 2FD74 80054974 2C820010 */ sltiu $v0, $a0, 0x10
|
|
/* 2FD78 80054978 1440FFFC */ bnez $v0, .L8005496C
|
|
/* 2FD7C 8005497C 24630004 */ addiu $v1, $v1, 4
|
|
.L80054980:
|
|
/* 2FD80 80054980 8FBF0014 */ lw $ra, 0x14($sp)
|
|
/* 2FD84 80054984 8FB00010 */ lw $s0, 0x10($sp)
|
|
/* 2FD88 80054988 03E00008 */ jr $ra
|
|
/* 2FD8C 8005498C 27BD0018 */ addiu $sp, $sp, 0x18
|