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>
129 lines
6.2 KiB
ArmAsm
129 lines
6.2 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_80068DA0
|
|
/* 441A0 80068DA0 27BDFFA0 */ addiu $sp, $sp, -0x60
|
|
/* 441A4 80068DA4 AFB30044 */ sw $s3, 0x44($sp)
|
|
/* 441A8 80068DA8 8FB30070 */ lw $s3, 0x70($sp)
|
|
/* 441AC 80068DAC AFB00038 */ sw $s0, 0x38($sp)
|
|
/* 441B0 80068DB0 00808021 */ addu $s0, $a0, $zero
|
|
/* 441B4 80068DB4 AFBE0058 */ sw $fp, 0x58($sp)
|
|
/* 441B8 80068DB8 00C0F021 */ addu $fp, $a2, $zero
|
|
/* 441BC 80068DBC AFB20040 */ sw $s2, 0x40($sp)
|
|
/* 441C0 80068DC0 00E09021 */ addu $s2, $a3, $zero
|
|
/* 441C4 80068DC4 AFBF005C */ sw $ra, 0x5c($sp)
|
|
/* 441C8 80068DC8 AFB70054 */ sw $s7, 0x54($sp)
|
|
/* 441CC 80068DCC AFB60050 */ sw $s6, 0x50($sp)
|
|
/* 441D0 80068DD0 AFB5004C */ sw $s5, 0x4c($sp)
|
|
/* 441D4 80068DD4 AFB40048 */ sw $s4, 0x48($sp)
|
|
/* 441D8 80068DD8 AFB1003C */ sw $s1, 0x3c($sp)
|
|
/* 441DC 80068DDC 8E020000 */ lw $v0, ($s0)
|
|
/* 441E0 80068DE0 8FB40074 */ lw $s4, 0x74($sp)
|
|
/* 441E4 80068DE4 30420001 */ andi $v0, $v0, 1
|
|
/* 441E8 80068DE8 1040004E */ beqz $v0, .L80068F24
|
|
/* 441EC 80068DEC 00A0B821 */ addu $s7, $a1, $zero
|
|
/* 441F0 80068DF0 0C01A76D */ jal func_80069DB4
|
|
/* 441F4 80068DF4 02002021 */ addu $a0, $s0, $zero
|
|
/* 441F8 80068DF8 00403821 */ addu $a3, $v0, $zero
|
|
/* 441FC 80068DFC 14E0004A */ bnez $a3, .L80068F28
|
|
/* 44200 80068E00 00000000 */ nop
|
|
/* 44204 80068E04 8E020050 */ lw $v0, 0x50($s0)
|
|
/* 44208 80068E08 18400044 */ blez $v0, .L80068F1C
|
|
/* 4420C 80068E0C 00008821 */ addu $s1, $zero, $zero
|
|
/* 44210 80068E10 27B60020 */ addiu $s6, $sp, 0x20
|
|
/* 44214 80068E14 27B5001C */ addiu $s5, $sp, 0x1c
|
|
.L80068E18:
|
|
/* 44218 80068E18 8E06005C */ lw $a2, 0x5c($s0)
|
|
/* 4421C 80068E1C 8E040004 */ lw $a0, 4($s0)
|
|
/* 44220 80068E20 8E050008 */ lw $a1, 8($s0)
|
|
/* 44224 80068E24 27A70010 */ addiu $a3, $sp, 0x10
|
|
/* 44228 80068E28 00D13021 */ addu $a2, $a2, $s1
|
|
/* 4422C 80068E2C 0C01A86C */ jal func_8006A1B0
|
|
/* 44230 80068E30 30C6FFFF */ andi $a2, $a2, 0xffff
|
|
/* 44234 80068E34 00403821 */ addu $a3, $v0, $zero
|
|
/* 44238 80068E38 14E0003B */ bnez $a3, .L80068F28
|
|
/* 4423C 80068E3C 00E01021 */ addu $v0, $a3, $zero
|
|
/* 44240 80068E40 8E040004 */ lw $a0, 4($s0)
|
|
/* 44244 80068E44 0C01A528 */ jal func_800694A0
|
|
/* 44248 80068E48 8E050008 */ lw $a1, 8($s0)
|
|
/* 4424C 80068E4C 00403821 */ addu $a3, $v0, $zero
|
|
/* 44250 80068E50 14E00027 */ bnez $a3, .L80068EF0
|
|
/* 44254 80068E54 32E2FFFF */ andi $v0, $s7, 0xffff
|
|
/* 44258 80068E58 97A30014 */ lhu $v1, 0x14($sp)
|
|
/* 4425C 80068E5C 1462002A */ bne $v1, $v0, .L80068F08
|
|
/* 44260 80068E60 00000000 */ nop
|
|
/* 44264 80068E64 8FA20010 */ lw $v0, 0x10($sp)
|
|
/* 44268 80068E68 145E0027 */ bne $v0, $fp, .L80068F08
|
|
/* 4426C 80068E6C 00000000 */ nop
|
|
/* 44270 80068E70 1240000C */ beqz $s2, .L80068EA4
|
|
/* 44274 80068E74 00004021 */ addu $t0, $zero, $zero
|
|
/* 44278 80068E78 00002021 */ addu $a0, $zero, $zero
|
|
/* 4427C 80068E7C 02403021 */ addu $a2, $s2, $zero
|
|
/* 44280 80068E80 02C02821 */ addu $a1, $s6, $zero
|
|
.L80068E84:
|
|
/* 44284 80068E84 90A30000 */ lbu $v1, ($a1)
|
|
/* 44288 80068E88 90C20000 */ lbu $v0, ($a2)
|
|
/* 4428C 80068E8C 1462001C */ bne $v1, $v0, .L80068F00
|
|
/* 44290 80068E90 24C60001 */ addiu $a2, $a2, 1
|
|
/* 44294 80068E94 24840001 */ addiu $a0, $a0, 1
|
|
/* 44298 80068E98 28820010 */ slti $v0, $a0, 0x10
|
|
/* 4429C 80068E9C 1440FFF9 */ bnez $v0, .L80068E84
|
|
/* 442A0 80068EA0 24A50001 */ addiu $a1, $a1, 1
|
|
.L80068EA4:
|
|
/* 442A4 80068EA4 0013102B */ sltu $v0, $zero, $s3
|
|
/* 442A8 80068EA8 2D030001 */ sltiu $v1, $t0, 1
|
|
/* 442AC 80068EAC 00431024 */ and $v0, $v0, $v1
|
|
/* 442B0 80068EB0 1040000C */ beqz $v0, .L80068EE4
|
|
/* 442B4 80068EB4 00000000 */ nop
|
|
/* 442B8 80068EB8 00002021 */ addu $a0, $zero, $zero
|
|
/* 442BC 80068EBC 02603021 */ addu $a2, $s3, $zero
|
|
/* 442C0 80068EC0 02A02821 */ addu $a1, $s5, $zero
|
|
.L80068EC4:
|
|
/* 442C4 80068EC4 90A30000 */ lbu $v1, ($a1)
|
|
/* 442C8 80068EC8 90C20000 */ lbu $v0, ($a2)
|
|
/* 442CC 80068ECC 1462000A */ bne $v1, $v0, .L80068EF8
|
|
/* 442D0 80068ED0 24C60001 */ addiu $a2, $a2, 1
|
|
/* 442D4 80068ED4 24840001 */ addiu $a0, $a0, 1
|
|
/* 442D8 80068ED8 28820004 */ slti $v0, $a0, 4
|
|
/* 442DC 80068EDC 1440FFF9 */ bnez $v0, .L80068EC4
|
|
/* 442E0 80068EE0 24A50001 */ addiu $a1, $a1, 1
|
|
.L80068EE4:
|
|
/* 442E4 80068EE4 15000008 */ bnez $t0, .L80068F08
|
|
/* 442E8 80068EE8 00000000 */ nop
|
|
/* 442EC 80068EEC AE910000 */ sw $s1, ($s4)
|
|
.L80068EF0:
|
|
/* 442F0 80068EF0 0801A3CA */ j .L80068F28
|
|
/* 442F4 80068EF4 00E01021 */ addu $v0, $a3, $zero
|
|
.L80068EF8:
|
|
/* 442F8 80068EF8 0801A3B9 */ j .L80068EE4
|
|
/* 442FC 80068EFC 24080001 */ addiu $t0, $zero, 1
|
|
.L80068F00:
|
|
/* 44300 80068F00 0801A3A9 */ j .L80068EA4
|
|
/* 44304 80068F04 24080001 */ addiu $t0, $zero, 1
|
|
.L80068F08:
|
|
/* 44308 80068F08 8E020050 */ lw $v0, 0x50($s0)
|
|
/* 4430C 80068F0C 26310001 */ addiu $s1, $s1, 1
|
|
/* 44310 80068F10 0222102A */ slt $v0, $s1, $v0
|
|
/* 44314 80068F14 1440FFC0 */ bnez $v0, .L80068E18
|
|
/* 44318 80068F18 00000000 */ nop
|
|
.L80068F1C:
|
|
/* 4431C 80068F1C 2402FFFF */ addiu $v0, $zero, -1
|
|
/* 44320 80068F20 AE820000 */ sw $v0, ($s4)
|
|
.L80068F24:
|
|
/* 44324 80068F24 24020005 */ addiu $v0, $zero, 5
|
|
.L80068F28:
|
|
/* 44328 80068F28 8FBF005C */ lw $ra, 0x5c($sp)
|
|
/* 4432C 80068F2C 8FBE0058 */ lw $fp, 0x58($sp)
|
|
/* 44330 80068F30 8FB70054 */ lw $s7, 0x54($sp)
|
|
/* 44334 80068F34 8FB60050 */ lw $s6, 0x50($sp)
|
|
/* 44338 80068F38 8FB5004C */ lw $s5, 0x4c($sp)
|
|
/* 4433C 80068F3C 8FB40048 */ lw $s4, 0x48($sp)
|
|
/* 44340 80068F40 8FB30044 */ lw $s3, 0x44($sp)
|
|
/* 44344 80068F44 8FB20040 */ lw $s2, 0x40($sp)
|
|
/* 44348 80068F48 8FB1003C */ lw $s1, 0x3c($sp)
|
|
/* 4434C 80068F4C 8FB00038 */ lw $s0, 0x38($sp)
|
|
/* 44350 80068F50 03E00008 */ jr $ra
|
|
/* 44354 80068F54 27BD0060 */ addiu $sp, $sp, 0x60
|
|
/* 44358 80068F58 00000000 */ nop
|
|
/* 4435C 80068F5C 00000000 */ nop
|