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>
62 lines
3.2 KiB
ArmAsm
62 lines
3.2 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_800604E0
|
|
/* 3B8E0 800604E0 27BDFFE8 */ addiu $sp, $sp, -0x18
|
|
/* 3B8E4 800604E4 AFBF0010 */ sw $ra, 0x10($sp)
|
|
/* 3B8E8 800604E8 0C018230 */ jal func_800608C0
|
|
/* 3B8EC 800604EC 00000000 */ nop
|
|
/* 3B8F0 800604F0 3C04800B */ lui $a0, %hi(D_800B0E98)
|
|
/* 3B8F4 800604F4 24840E98 */ addiu $a0, $a0, %lo(D_800B0E98)
|
|
/* 3B8F8 800604F8 3C05800B */ lui $a1, %hi(D_800AE6B0)
|
|
/* 3B8FC 800604FC 24A5E6B0 */ addiu $a1, $a1, %lo(D_800AE6B0)
|
|
/* 3B900 80060500 0C019554 */ jal func_80065550
|
|
/* 3B904 80060504 24060001 */ addiu $a2, $zero, 1
|
|
/* 3B908 80060508 3C04800E */ lui $a0, %hi(D_800DC020)
|
|
/* 3B90C 8006050C 2484C020 */ addiu $a0, $a0, %lo(D_800DC020)
|
|
/* 3B910 80060510 3C05800B */ lui $a1, %hi(D_800AE6B4)
|
|
/* 3B914 80060514 24A5E6B4 */ addiu $a1, $a1, %lo(D_800AE6B4)
|
|
/* 3B918 80060518 0C019554 */ jal func_80065550
|
|
/* 3B91C 8006051C 24060001 */ addiu $a2, $zero, 1
|
|
/* 3B920 80060520 3C048009 */ lui $a0, %hi(D_80093D18)
|
|
/* 3B924 80060524 0C0180F0 */ jal func_800603C0
|
|
/* 3B928 80060528 24843D18 */ addiu $a0, $a0, %lo(D_80093D18)
|
|
/* 3B92C 8006052C 0C01823C */ jal func_800608F0
|
|
/* 3B930 80060530 00000000 */ nop
|
|
/* 3B934 80060534 24050001 */ addiu $a1, $zero, 1
|
|
/* 3B938 80060538 0000302D */ daddu $a2, $zero, $zero
|
|
/* 3B93C 8006053C 0000202D */ daddu $a0, $zero, $zero
|
|
/* 3B940 80060540 24070005 */ addiu $a3, $zero, 5
|
|
/* 3B944 80060544 3C01800A */ lui $at, %hi(D_8009A5F4)
|
|
/* 3B948 80060548 AC20A5F4 */ sw $zero, %lo(D_8009A5F4)($at)
|
|
/* 3B94C 8006054C 00041880 */ sll $v1, $a0, 2
|
|
.L80060550:
|
|
/* 3B950 80060550 3C02800B */ lui $v0, %hi(D_800B1B5F)
|
|
/* 3B954 80060554 00431021 */ addu $v0, $v0, $v1
|
|
/* 3B958 80060558 90421B5F */ lbu $v0, %lo(D_800B1B5F)($v0)
|
|
/* 3B95C 8006055C 5440000F */ bnel $v0, $zero, .L8006059C
|
|
/* 3B960 80060560 24840001 */ addiu $a0, $a0, 1
|
|
/* 3B964 80060564 3C02800B */ lui $v0, %hi(D_800B1B5C)
|
|
/* 3B968 80060568 00431021 */ addu $v0, $v0, $v1
|
|
/* 3B96C 8006056C 94421B5C */ lhu $v0, %lo(D_800B1B5C)($v0)
|
|
/* 3B970 80060570 30421F07 */ andi $v0, $v0, 0x1f07
|
|
/* 3B974 80060574 54470008 */ bnel $v0, $a3, .L80060598
|
|
/* 3B978 80060578 00052840 */ sll $a1, $a1, 1
|
|
/* 3B97C 8006057C 3C02800A */ lui $v0, %hi(D_8009A5F4)
|
|
/* 3B980 80060580 8C42A5F4 */ lw $v0, %lo(D_8009A5F4)($v0)
|
|
/* 3B984 80060584 00C53025 */ or $a2, $a2, $a1
|
|
/* 3B988 80060588 24420001 */ addiu $v0, $v0, 1
|
|
/* 3B98C 8006058C 3C01800A */ lui $at, %hi(D_8009A5F4)
|
|
/* 3B990 80060590 AC22A5F4 */ sw $v0, %lo(D_8009A5F4)($at)
|
|
/* 3B994 80060594 00052840 */ sll $a1, $a1, 1
|
|
.L80060598:
|
|
/* 3B998 80060598 24840001 */ addiu $a0, $a0, 1
|
|
.L8006059C:
|
|
/* 3B99C 8006059C 28820004 */ slti $v0, $a0, 4
|
|
/* 3B9A0 800605A0 1440FFEB */ bnez $v0, .L80060550
|
|
/* 3B9A4 800605A4 00041880 */ sll $v1, $a0, 2
|
|
/* 3B9A8 800605A8 8FBF0010 */ lw $ra, 0x10($sp)
|
|
/* 3B9AC 800605AC 30C200FF */ andi $v0, $a2, 0xff
|
|
/* 3B9B0 800605B0 03E00008 */ jr $ra
|
|
/* 3B9B4 800605B4 27BD0018 */ addiu $sp, $sp, 0x18
|