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>
56 lines
2.7 KiB
ArmAsm
56 lines
2.7 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_8013559C
|
|
/* CBC9C 8013559C 8083001A */ lb $v1, 0x1a($a0)
|
|
/* CBCA0 801355A0 24020001 */ addiu $v0, $zero, 1
|
|
/* CBCA4 801355A4 1462002A */ bne $v1, $v0, .L80135650
|
|
/* CBCA8 801355A8 3C020002 */ lui $v0, 2
|
|
/* CBCAC 801355AC 8C860000 */ lw $a2, ($a0)
|
|
/* CBCB0 801355B0 8083001B */ lb $v1, 0x1b($a0)
|
|
/* CBCB4 801355B4 8C850014 */ lw $a1, 0x14($a0)
|
|
/* CBCB8 801355B8 00C21024 */ and $v0, $a2, $v0
|
|
/* CBCBC 801355BC 0002382B */ sltu $a3, $zero, $v0
|
|
/* CBCC0 801355C0 24020014 */ addiu $v0, $zero, 0x14
|
|
/* CBCC4 801355C4 10620022 */ beq $v1, $v0, .L80135650
|
|
/* CBCC8 801355C8 24020017 */ addiu $v0, $zero, 0x17
|
|
/* CBCCC 801355CC 10620015 */ beq $v1, $v0, .L80135624
|
|
/* CBCD0 801355D0 00000000 */ nop
|
|
/* CBCD4 801355D4 8CA2001C */ lw $v0, 0x1c($a1)
|
|
/* CBCD8 801355D8 2842003C */ slti $v0, $v0, 0x3c
|
|
/* CBCDC 801355DC 1040001C */ beqz $v0, .L80135650
|
|
/* CBCE0 801355E0 3C020020 */ lui $v0, 0x20
|
|
/* CBCE4 801355E4 00C21024 */ and $v0, $a2, $v0
|
|
/* CBCE8 801355E8 14400008 */ bnez $v0, .L8013560C
|
|
/* CBCEC 801355EC 2402FFBF */ addiu $v0, $zero, -0x41
|
|
/* CBCF0 801355F0 3C028007 */ lui $v0, %hi(gGameStatusPtr)
|
|
/* CBCF4 801355F4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0)
|
|
/* CBCF8 801355F8 94420134 */ lhu $v0, 0x134($v0)
|
|
/* CBCFC 801355FC 00471021 */ addu $v0, $v0, $a3
|
|
/* CBD00 80135600 30420001 */ andi $v0, $v0, 1
|
|
/* CBD04 80135604 10400004 */ beqz $v0, .L80135618
|
|
/* CBD08 80135608 2402FFBF */ addiu $v0, $zero, -0x41
|
|
.L8013560C:
|
|
/* CBD0C 8013560C 00C21024 */ and $v0, $a2, $v0
|
|
/* CBD10 80135610 03E00008 */ jr $ra
|
|
/* CBD14 80135614 AC820000 */ sw $v0, ($a0)
|
|
.L80135618:
|
|
/* CBD18 80135618 34C20040 */ ori $v0, $a2, 0x40
|
|
/* CBD1C 8013561C 03E00008 */ jr $ra
|
|
/* CBD20 80135620 AC820000 */ sw $v0, ($a0)
|
|
.L80135624:
|
|
/* CBD24 80135624 8CA3001C */ lw $v1, 0x1c($a1)
|
|
/* CBD28 80135628 2862000A */ slti $v0, $v1, 0xa
|
|
/* CBD2C 8013562C 10400008 */ beqz $v0, .L80135650
|
|
/* CBD30 80135630 000310C0 */ sll $v0, $v1, 3
|
|
/* CBD34 80135634 00431023 */ subu $v0, $v0, $v1
|
|
/* CBD38 80135638 00021080 */ sll $v0, $v0, 2
|
|
/* CBD3C 8013563C A082002F */ sb $v0, 0x2f($a0)
|
|
/* CBD40 80135640 8C820000 */ lw $v0, ($a0)
|
|
/* CBD44 80135644 3C030008 */ lui $v1, 8
|
|
/* CBD48 80135648 00431025 */ or $v0, $v0, $v1
|
|
/* CBD4C 8013564C AC820000 */ sw $v0, ($a0)
|
|
.L80135650:
|
|
/* CBD50 80135650 03E00008 */ jr $ra
|
|
/* CBD54 80135654 00000000 */ nop
|