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>
50 lines
2.3 KiB
ArmAsm
50 lines
2.3 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_800603C0
|
|
/* 3B7C0 800603C0 27BDFFE0 */ addiu $sp, $sp, -0x20
|
|
/* 3B7C4 800603C4 AFB00010 */ sw $s0, 0x10($sp)
|
|
/* 3B7C8 800603C8 3C108009 */ lui $s0, %hi(D_80093CF0)
|
|
/* 3B7CC 800603CC 26103CF0 */ addiu $s0, $s0, %lo(D_80093CF0)
|
|
/* 3B7D0 800603D0 AFBF001C */ sw $ra, 0x1c($sp)
|
|
/* 3B7D4 800603D4 AFB20018 */ sw $s2, 0x18($sp)
|
|
/* 3B7D8 800603D8 AFB10014 */ sw $s1, 0x14($sp)
|
|
/* 3B7DC 800603DC 8E020000 */ lw $v0, ($s0)
|
|
/* 3B7E0 800603E0 10400009 */ beqz $v0, .L80060408
|
|
/* 3B7E4 800603E4 0080902D */ daddu $s2, $a0, $zero
|
|
/* 3B7E8 800603E8 96440008 */ lhu $a0, 8($s2)
|
|
.L800603EC:
|
|
/* 3B7EC 800603EC 8E030000 */ lw $v1, ($s0)
|
|
/* 3B7F0 800603F0 94620008 */ lhu $v0, 8($v1)
|
|
/* 3B7F4 800603F4 10440014 */ beq $v0, $a0, .L80060448
|
|
/* 3B7F8 800603F8 0060802D */ daddu $s0, $v1, $zero
|
|
/* 3B7FC 800603FC 8E020000 */ lw $v0, ($s0)
|
|
/* 3B800 80060400 1440FFFA */ bnez $v0, .L800603EC
|
|
/* 3B804 80060404 00000000 */ nop
|
|
.L80060408:
|
|
/* 3B808 80060408 8E430004 */ lw $v1, 4($s2)
|
|
/* 3B80C 8006040C 8C620004 */ lw $v0, 4($v1)
|
|
/* 3B810 80060410 10400006 */ beqz $v0, .L8006042C
|
|
/* 3B814 80060414 24110001 */ addiu $s1, $zero, 1
|
|
/* 3B818 80060418 24630004 */ addiu $v1, $v1, 4
|
|
.L8006041C:
|
|
/* 3B81C 8006041C 24630004 */ addiu $v1, $v1, 4
|
|
/* 3B820 80060420 8C620000 */ lw $v0, ($v1)
|
|
/* 3B824 80060424 1440FFFD */ bnez $v0, .L8006041C
|
|
/* 3B828 80060428 26310001 */ addiu $s1, $s1, 1
|
|
.L8006042C:
|
|
/* 3B82C 8006042C 0C018244 */ jal func_80060910
|
|
/* 3B830 80060430 24040001 */ addiu $a0, $zero, 1
|
|
/* 3B834 80060434 0040202D */ daddu $a0, $v0, $zero
|
|
/* 3B838 80060438 AE120000 */ sw $s2, ($s0)
|
|
/* 3B83C 8006043C AE400000 */ sw $zero, ($s2)
|
|
/* 3B840 80060440 0C018244 */ jal func_80060910
|
|
/* 3B844 80060444 A251000A */ sb $s1, 0xa($s2)
|
|
.L80060448:
|
|
/* 3B848 80060448 8FBF001C */ lw $ra, 0x1c($sp)
|
|
/* 3B84C 8006044C 8FB20018 */ lw $s2, 0x18($sp)
|
|
/* 3B850 80060450 8FB10014 */ lw $s1, 0x14($sp)
|
|
/* 3B854 80060454 8FB00010 */ lw $s0, 0x10($sp)
|
|
/* 3B858 80060458 03E00008 */ jr $ra
|
|
/* 3B85C 8006045C 27BD0020 */ addiu $sp, $sp, 0x20
|