mirror of
https://github.com/pmret/papermario.git
synced 2024-11-18 08:52:40 +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>
65 lines
3.1 KiB
ArmAsm
65 lines
3.1 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_8003516C
|
|
/* 1056C 8003516C 27BDFFE0 */ addiu $sp, $sp, -0x20
|
|
/* 10570 80035170 AFB10014 */ sw $s1, 0x14($sp)
|
|
/* 10574 80035174 3C11800A */ lui $s1, %hi(D_8009E741)
|
|
/* 10578 80035178 2631E741 */ addiu $s1, $s1, %lo(D_8009E741)
|
|
/* 1057C 8003517C AFBF0018 */ sw $ra, 0x18($sp)
|
|
/* 10580 80035180 AFB00010 */ sw $s0, 0x10($sp)
|
|
/* 10584 80035184 82300000 */ lb $s0, ($s1)
|
|
/* 10588 80035188 24030001 */ addiu $v1, $zero, 1
|
|
/* 1058C 8003518C 1203000B */ beq $s0, $v1, .L800351BC
|
|
/* 10590 80035190 2A020002 */ slti $v0, $s0, 2
|
|
/* 10594 80035194 50400005 */ beql $v0, $zero, .L800351AC
|
|
/* 10598 80035198 24020002 */ addiu $v0, $zero, 2
|
|
/* 1059C 8003519C 52000024 */ beql $s0, $zero, .L80035230
|
|
/* 105A0 800351A0 A2230000 */ sb $v1, ($s1)
|
|
/* 105A4 800351A4 0800D48C */ j .L80035230
|
|
/* 105A8 800351A8 00000000 */ nop
|
|
.L800351AC:
|
|
/* 105AC 800351AC 1202000A */ beq $s0, $v0, .L800351D8
|
|
/* 105B0 800351B0 00000000 */ nop
|
|
/* 105B4 800351B4 0800D48C */ j .L80035230
|
|
/* 105B8 800351B8 00000000 */ nop
|
|
.L800351BC:
|
|
/* 105BC 800351BC 0C0533DD */ jal func_8014CF74
|
|
/* 105C0 800351C0 24040003 */ addiu $a0, $zero, 3
|
|
/* 105C4 800351C4 24020002 */ addiu $v0, $zero, 2
|
|
/* 105C8 800351C8 3C01800A */ lui $at, %hi(D_8009E740)
|
|
/* 105CC 800351CC A030E740 */ sb $s0, %lo(D_8009E740)($at)
|
|
/* 105D0 800351D0 0800D48C */ j .L80035230
|
|
/* 105D4 800351D4 A2220000 */ sb $v0, ($s1)
|
|
.L800351D8:
|
|
/* 105D8 800351D8 3C10800A */ lui $s0, %hi(D_8009E740)
|
|
/* 105DC 800351DC 2610E740 */ addiu $s0, $s0, %lo(D_8009E740)
|
|
/* 105E0 800351E0 82020000 */ lb $v0, ($s0)
|
|
/* 105E4 800351E4 92030000 */ lbu $v1, ($s0)
|
|
/* 105E8 800351E8 0440000F */ bltz $v0, .L80035228
|
|
/* 105EC 800351EC 2462FFFF */ addiu $v0, $v1, -1
|
|
/* 105F0 800351F0 A2020000 */ sb $v0, ($s0)
|
|
/* 105F4 800351F4 00021600 */ sll $v0, $v0, 0x18
|
|
/* 105F8 800351F8 14400008 */ bnez $v0, .L8003521C
|
|
/* 105FC 800351FC 2402FFFF */ addiu $v0, $zero, -1
|
|
/* 10600 80035200 0C00AB18 */ jal func_8002AC60
|
|
/* 10604 80035204 A2020000 */ sb $v0, ($s0)
|
|
/* 10608 80035208 3C048007 */ lui $a0, %hi(D_8007795C)
|
|
/* 1060C 8003520C 0C017F64 */ jal func_8005FD90
|
|
/* 10610 80035210 2484795C */ addiu $a0, $a0, %lo(D_8007795C)
|
|
/* 10614 80035214 0C09102C */ jal func_802440B0
|
|
/* 10618 80035218 0000202D */ daddu $a0, $zero, $zero
|
|
.L8003521C:
|
|
/* 1061C 8003521C 82020000 */ lb $v0, ($s0)
|
|
/* 10620 80035220 04410003 */ bgez $v0, .L80035230
|
|
/* 10624 80035224 00000000 */ nop
|
|
.L80035228:
|
|
/* 10628 80035228 0C090A5C */ jal func_80242970
|
|
/* 1062C 8003522C 00000000 */ nop
|
|
.L80035230:
|
|
/* 10630 80035230 8FBF0018 */ lw $ra, 0x18($sp)
|
|
/* 10634 80035234 8FB10014 */ lw $s1, 0x14($sp)
|
|
/* 10638 80035238 8FB00010 */ lw $s0, 0x10($sp)
|
|
/* 1063C 8003523C 03E00008 */ jr $ra
|
|
/* 10640 80035240 27BD0020 */ addiu $sp, $sp, 0x20
|