mirror of
https://github.com/pmret/papermario.git
synced 2024-11-15 07:22:29 +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>
40 lines
2.0 KiB
ArmAsm
40 lines
2.0 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_8024EB84
|
|
/* 17D464 8024EB84 3C028028 */ lui $v0, %hi(D_80280CE0)
|
|
/* 17D468 8024EB88 80420CE0 */ lb $v0, %lo(D_80280CE0)($v0)
|
|
/* 17D46C 8024EB8C 27BDFFE0 */ addiu $sp, $sp, -0x20
|
|
/* 17D470 8024EB90 AFB20018 */ sw $s2, 0x18($sp)
|
|
/* 17D474 8024EB94 0080902D */ daddu $s2, $a0, $zero
|
|
/* 17D478 8024EB98 AFBF001C */ sw $ra, 0x1c($sp)
|
|
/* 17D47C 8024EB9C AFB10014 */ sw $s1, 0x14($sp)
|
|
/* 17D480 8024EBA0 AFB00010 */ sw $s0, 0x10($sp)
|
|
/* 17D484 8024EBA4 8E51000C */ lw $s1, 0xc($s2)
|
|
/* 17D488 8024EBA8 14400011 */ bnez $v0, .L8024EBF0
|
|
/* 17D48C 8024EBAC 24020002 */ addiu $v0, $zero, 2
|
|
/* 17D490 8024EBB0 8E250000 */ lw $a1, ($s1)
|
|
/* 17D494 8024EBB4 26310004 */ addiu $s1, $s1, 4
|
|
/* 17D498 8024EBB8 0C0B1EAF */ jal get_variable
|
|
/* 17D49C 8024EBBC 0240202D */ daddu $a0, $s2, $zero
|
|
/* 17D4A0 8024EBC0 0040802D */ daddu $s0, $v0, $zero
|
|
/* 17D4A4 8024EBC4 2402FF81 */ addiu $v0, $zero, -0x7f
|
|
/* 17D4A8 8024EBC8 16020002 */ bne $s0, $v0, .L8024EBD4
|
|
/* 17D4AC 8024EBCC 00000000 */ nop
|
|
/* 17D4B0 8024EBD0 8E500148 */ lw $s0, 0x148($s2)
|
|
.L8024EBD4:
|
|
/* 17D4B4 8024EBD4 8E250000 */ lw $a1, ($s1)
|
|
/* 17D4B8 8024EBD8 0C0B1EAF */ jal get_variable
|
|
/* 17D4BC 8024EBDC 0240202D */ daddu $a0, $s2, $zero
|
|
/* 17D4C0 8024EBE0 0200202D */ daddu $a0, $s0, $zero
|
|
/* 17D4C4 8024EBE4 0C093917 */ jal func_8024E45C
|
|
/* 17D4C8 8024EBE8 0040282D */ daddu $a1, $v0, $zero
|
|
/* 17D4CC 8024EBEC 24020002 */ addiu $v0, $zero, 2
|
|
.L8024EBF0:
|
|
/* 17D4D0 8024EBF0 8FBF001C */ lw $ra, 0x1c($sp)
|
|
/* 17D4D4 8024EBF4 8FB20018 */ lw $s2, 0x18($sp)
|
|
/* 17D4D8 8024EBF8 8FB10014 */ lw $s1, 0x14($sp)
|
|
/* 17D4DC 8024EBFC 8FB00010 */ lw $s0, 0x10($sp)
|
|
/* 17D4E0 8024EC00 03E00008 */ jr $ra
|
|
/* 17D4E4 8024EC04 27BD0020 */ addiu $sp, $sp, 0x20
|