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>
46 lines
2.1 KiB
ArmAsm
46 lines
2.1 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_8005A100
|
|
/* 35500 8005A100 27BDFFE0 */ addiu $sp, $sp, -0x20
|
|
/* 35504 8005A104 AFB10014 */ sw $s1, 0x14($sp)
|
|
/* 35508 8005A108 0080882D */ daddu $s1, $a0, $zero
|
|
/* 3550C 8005A10C AFB00010 */ sw $s0, 0x10($sp)
|
|
/* 35510 8005A110 0000802D */ daddu $s0, $zero, $zero
|
|
/* 35514 8005A114 3C03800B */ lui $v1, %hi(D_800B4378)
|
|
/* 35518 8005A118 24634378 */ addiu $v1, $v1, %lo(D_800B4378)
|
|
/* 3551C 8005A11C AFBF0018 */ sw $ra, 0x18($sp)
|
|
.L8005A120:
|
|
/* 35520 8005A120 8C620000 */ lw $v0, ($v1)
|
|
/* 35524 8005A124 10510006 */ beq $v0, $s1, .L8005A140
|
|
/* 35528 8005A128 2A020060 */ slti $v0, $s0, 0x60
|
|
/* 3552C 8005A12C 26100001 */ addiu $s0, $s0, 1
|
|
/* 35530 8005A130 2A020060 */ slti $v0, $s0, 0x60
|
|
/* 35534 8005A134 1440FFFA */ bnez $v0, .L8005A120
|
|
/* 35538 8005A138 24630004 */ addiu $v1, $v1, 4
|
|
/* 3553C 8005A13C 2A020060 */ slti $v0, $s0, 0x60
|
|
.L8005A140:
|
|
/* 35540 8005A140 14400003 */ bnez $v0, .L8005A150
|
|
/* 35544 8005A144 00000000 */ nop
|
|
.L8005A148:
|
|
/* 35548 8005A148 08016852 */ j .L8005A148
|
|
/* 3554C 8005A14C 00000000 */ nop
|
|
.L8005A150:
|
|
/* 35550 8005A150 8E24000C */ lw $a0, 0xc($s1)
|
|
/* 35554 8005A154 10800003 */ beqz $a0, .L8005A164
|
|
/* 35558 8005A158 00000000 */ nop
|
|
/* 3555C 8005A15C 0C00AB0E */ jal func_8002AC38
|
|
/* 35560 8005A160 00000000 */ nop
|
|
.L8005A164:
|
|
/* 35564 8005A164 0C00AB0E */ jal func_8002AC38
|
|
/* 35568 8005A168 0220202D */ daddu $a0, $s1, $zero
|
|
/* 3556C 8005A16C 00101080 */ sll $v0, $s0, 2
|
|
/* 35570 8005A170 3C01800B */ lui $at, %hi(D_800B4378)
|
|
/* 35574 8005A174 00220821 */ addu $at, $at, $v0
|
|
/* 35578 8005A178 AC204378 */ sw $zero, %lo(D_800B4378)($at)
|
|
/* 3557C 8005A17C 8FBF0018 */ lw $ra, 0x18($sp)
|
|
/* 35580 8005A180 8FB10014 */ lw $s1, 0x14($sp)
|
|
/* 35584 8005A184 8FB00010 */ lw $s0, 0x10($sp)
|
|
/* 35588 8005A188 03E00008 */ jr $ra
|
|
/* 3558C 8005A18C 27BD0020 */ addiu $sp, $sp, 0x20
|