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>
187 lines
9.7 KiB
ArmAsm
187 lines
9.7 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_80053C30
|
|
/* 2F030 80053C30 27BDFFC8 */ addiu $sp, $sp, -0x38
|
|
/* 2F034 80053C34 AFB30024 */ sw $s3, 0x24($sp)
|
|
/* 2F038 80053C38 3C13800A */ lui $s3, %hi(D_8009A5A0)
|
|
/* 2F03C 80053C3C 8E73A5A0 */ lw $s3, %lo(D_8009A5A0)($s3)
|
|
/* 2F040 80053C40 AFB5002C */ sw $s5, 0x2c($sp)
|
|
/* 2F044 80053C44 0080A82D */ daddu $s5, $a0, $zero
|
|
/* 2F048 80053C48 AFB20020 */ sw $s2, 0x20($sp)
|
|
/* 2F04C 80053C4C 3C12800A */ lui $s2, %hi(D_8009A608)
|
|
/* 2F050 80053C50 8E52A608 */ lw $s2, %lo(D_8009A608)($s2)
|
|
/* 2F054 80053C54 2EA20010 */ sltiu $v0, $s5, 0x10
|
|
/* 2F058 80053C58 AFBF0030 */ sw $ra, 0x30($sp)
|
|
/* 2F05C 80053C5C AFB40028 */ sw $s4, 0x28($sp)
|
|
/* 2F060 80053C60 AFB1001C */ sw $s1, 0x1c($sp)
|
|
/* 2F064 80053C64 10400022 */ beqz $v0, .L80053CF0
|
|
/* 2F068 80053C68 AFB00018 */ sw $s0, 0x18($sp)
|
|
/* 2F06C 80053C6C 8E420044 */ lw $v0, 0x44($s2)
|
|
/* 2F070 80053C70 14400097 */ bnez $v0, .L80053ED0
|
|
/* 2F074 80053C74 00000000 */ nop
|
|
/* 2F078 80053C78 24050040 */ addiu $a1, $zero, 0x40
|
|
/* 2F07C 80053C7C 3C028008 */ lui $v0, %hi(D_80078550)
|
|
/* 2F080 80053C80 00551021 */ addu $v0, $v0, $s5
|
|
/* 2F084 80053C84 90428550 */ lbu $v0, %lo(D_80078550)($v0)
|
|
/* 2F088 80053C88 8E63003C */ lw $v1, 0x3c($s3)
|
|
/* 2F08C 80053C8C 00021040 */ sll $v0, $v0, 1
|
|
/* 2F090 80053C90 00431021 */ addu $v0, $v0, $v1
|
|
/* 2F094 80053C94 94440000 */ lhu $a0, ($v0)
|
|
/* 2F098 80053C98 0C01504B */ jal func_8005412C
|
|
/* 2F09C 80053C9C 27A60010 */ addiu $a2, $sp, 0x10
|
|
/* 2F0A0 80053CA0 1440008B */ bnez $v0, .L80053ED0
|
|
/* 2F0A4 80053CA4 3C0200FF */ lui $v0, 0xff
|
|
/* 2F0A8 80053CA8 3442FFFF */ ori $v0, $v0, 0xffff
|
|
/* 2F0AC 80053CAC 8FA40010 */ lw $a0, 0x10($sp)
|
|
/* 2F0B0 80053CB0 8FA60014 */ lw $a2, 0x14($sp)
|
|
/* 2F0B4 80053CB4 8E650064 */ lw $a1, 0x64($s3)
|
|
/* 2F0B8 80053CB8 0C0152AC */ jal func_80054AB0
|
|
/* 2F0BC 80053CBC 00C23024 */ and $a2, $a2, $v0
|
|
/* 2F0C0 80053CC0 24030001 */ addiu $v1, $zero, 1
|
|
/* 2F0C4 80053CC4 8E620064 */ lw $v0, 0x64($s3)
|
|
/* 2F0C8 80053CC8 26440004 */ addiu $a0, $s2, 4
|
|
/* 2F0CC 80053CCC AE420010 */ sw $v0, 0x10($s2)
|
|
.L80053CD0:
|
|
/* 2F0D0 80053CD0 AC800010 */ sw $zero, 0x10($a0)
|
|
/* 2F0D4 80053CD4 24630001 */ addiu $v1, $v1, 1
|
|
/* 2F0D8 80053CD8 2C620004 */ sltiu $v0, $v1, 4
|
|
/* 2F0DC 80053CDC 1440FFFC */ bnez $v0, .L80053CD0
|
|
/* 2F0E0 80053CE0 24840004 */ addiu $a0, $a0, 4
|
|
/* 2F0E4 80053CE4 24020001 */ addiu $v0, $zero, 1
|
|
/* 2F0E8 80053CE8 08014FB4 */ j .L80053ED0
|
|
/* 2F0EC 80053CEC A2420020 */ sb $v0, 0x20($s2)
|
|
.L80053CF0:
|
|
/* 2F0F0 80053CF0 24020010 */ addiu $v0, $zero, 0x10
|
|
/* 2F0F4 80053CF4 16A20076 */ bne $s5, $v0, .L80053ED0
|
|
/* 2F0F8 80053CF8 00000000 */ nop
|
|
/* 2F0FC 80053CFC 8E420044 */ lw $v0, 0x44($s2)
|
|
/* 2F100 80053D00 14400073 */ bnez $v0, .L80053ED0
|
|
/* 2F104 80053D04 00000000 */ nop
|
|
/* 2F108 80053D08 8E420228 */ lw $v0, 0x228($s2)
|
|
/* 2F10C 80053D0C 14400070 */ bnez $v0, .L80053ED0
|
|
/* 2F110 80053D10 00000000 */ nop
|
|
/* 2F114 80053D14 8E42040C */ lw $v0, 0x40c($s2)
|
|
/* 2F118 80053D18 1440006D */ bnez $v0, .L80053ED0
|
|
/* 2F11C 80053D1C 0000182D */ daddu $v1, $zero, $zero
|
|
/* 2F120 80053D20 A2400020 */ sb $zero, 0x20($s2)
|
|
/* 2F124 80053D24 0240202D */ daddu $a0, $s2, $zero
|
|
.L80053D28:
|
|
/* 2F128 80053D28 AC800010 */ sw $zero, 0x10($a0)
|
|
/* 2F12C 80053D2C 24630001 */ addiu $v1, $v1, 1
|
|
/* 2F130 80053D30 2C620004 */ sltiu $v0, $v1, 4
|
|
/* 2F134 80053D34 1440FFFC */ bnez $v0, .L80053D28
|
|
/* 2F138 80053D38 24840004 */ addiu $a0, $a0, 4
|
|
/* 2F13C 80053D3C 8E700068 */ lw $s0, 0x68($s3)
|
|
/* 2F140 80053D40 24050040 */ addiu $a1, $zero, 0x40
|
|
/* 2F144 80053D44 3C148008 */ lui $s4, %hi(D_80078550)
|
|
/* 2F148 80053D48 26948550 */ addiu $s4, $s4, %lo(D_80078550)
|
|
/* 2F14C 80053D4C 3C028008 */ lui $v0, %hi(D_80078550)
|
|
/* 2F150 80053D50 00551021 */ addu $v0, $v0, $s5
|
|
/* 2F154 80053D54 90428550 */ lbu $v0, %lo(D_80078550)($v0)
|
|
/* 2F158 80053D58 8E63003C */ lw $v1, 0x3c($s3)
|
|
/* 2F15C 80053D5C 00021040 */ sll $v0, $v0, 1
|
|
/* 2F160 80053D60 00431021 */ addu $v0, $v0, $v1
|
|
/* 2F164 80053D64 94440000 */ lhu $a0, ($v0)
|
|
/* 2F168 80053D68 0C01504B */ jal func_8005412C
|
|
/* 2F16C 80053D6C 27A60010 */ addiu $a2, $sp, 0x10
|
|
/* 2F170 80053D70 14400057 */ bnez $v0, .L80053ED0
|
|
/* 2F174 80053D74 3C1100FF */ lui $s1, 0xff
|
|
/* 2F178 80053D78 3631FFFF */ ori $s1, $s1, 0xffff
|
|
/* 2F17C 80053D7C 0200282D */ daddu $a1, $s0, $zero
|
|
/* 2F180 80053D80 8FA60014 */ lw $a2, 0x14($sp)
|
|
/* 2F184 80053D84 8FA40010 */ lw $a0, 0x10($sp)
|
|
/* 2F188 80053D88 0C0152AC */ jal func_80054AB0
|
|
/* 2F18C 80053D8C 00D13024 */ and $a2, $a2, $s1
|
|
/* 2F190 80053D90 24050040 */ addiu $a1, $zero, 0x40
|
|
/* 2F194 80053D94 27A60010 */ addiu $a2, $sp, 0x10
|
|
/* 2F198 80053D98 02B41021 */ addu $v0, $s5, $s4
|
|
/* 2F19C 80053D9C AE500010 */ sw $s0, 0x10($s2)
|
|
/* 2F1A0 80053DA0 90430001 */ lbu $v1, 1($v0)
|
|
/* 2F1A4 80053DA4 8E62003C */ lw $v0, 0x3c($s3)
|
|
/* 2F1A8 80053DA8 00031840 */ sll $v1, $v1, 1
|
|
/* 2F1AC 80053DAC 00621821 */ addu $v1, $v1, $v0
|
|
/* 2F1B0 80053DB0 8FA20014 */ lw $v0, 0x14($sp)
|
|
/* 2F1B4 80053DB4 94640000 */ lhu $a0, ($v1)
|
|
/* 2F1B8 80053DB8 00451021 */ addu $v0, $v0, $a1
|
|
/* 2F1BC 80053DBC 00511024 */ and $v0, $v0, $s1
|
|
/* 2F1C0 80053DC0 0C01504B */ jal func_8005412C
|
|
/* 2F1C4 80053DC4 02028021 */ addu $s0, $s0, $v0
|
|
/* 2F1C8 80053DC8 14400041 */ bnez $v0, .L80053ED0
|
|
/* 2F1CC 80053DCC 00000000 */ nop
|
|
/* 2F1D0 80053DD0 0200282D */ daddu $a1, $s0, $zero
|
|
/* 2F1D4 80053DD4 8FA60014 */ lw $a2, 0x14($sp)
|
|
/* 2F1D8 80053DD8 8FA40010 */ lw $a0, 0x10($sp)
|
|
/* 2F1DC 80053DDC 0C0152AC */ jal func_80054AB0
|
|
/* 2F1E0 80053DE0 00D13024 */ and $a2, $a2, $s1
|
|
/* 2F1E4 80053DE4 24050040 */ addiu $a1, $zero, 0x40
|
|
/* 2F1E8 80053DE8 27A60010 */ addiu $a2, $sp, 0x10
|
|
/* 2F1EC 80053DEC 02B41021 */ addu $v0, $s5, $s4
|
|
/* 2F1F0 80053DF0 AE500014 */ sw $s0, 0x14($s2)
|
|
/* 2F1F4 80053DF4 90430002 */ lbu $v1, 2($v0)
|
|
/* 2F1F8 80053DF8 8E62003C */ lw $v0, 0x3c($s3)
|
|
/* 2F1FC 80053DFC 00031840 */ sll $v1, $v1, 1
|
|
/* 2F200 80053E00 00621821 */ addu $v1, $v1, $v0
|
|
/* 2F204 80053E04 8FA20014 */ lw $v0, 0x14($sp)
|
|
/* 2F208 80053E08 94640000 */ lhu $a0, ($v1)
|
|
/* 2F20C 80053E0C 00451021 */ addu $v0, $v0, $a1
|
|
/* 2F210 80053E10 00511024 */ and $v0, $v0, $s1
|
|
/* 2F214 80053E14 0C01504B */ jal func_8005412C
|
|
/* 2F218 80053E18 02028021 */ addu $s0, $s0, $v0
|
|
/* 2F21C 80053E1C 1440002C */ bnez $v0, .L80053ED0
|
|
/* 2F220 80053E20 00000000 */ nop
|
|
/* 2F224 80053E24 0200282D */ daddu $a1, $s0, $zero
|
|
/* 2F228 80053E28 8FA60014 */ lw $a2, 0x14($sp)
|
|
/* 2F22C 80053E2C 8FA40010 */ lw $a0, 0x10($sp)
|
|
/* 2F230 80053E30 0C0152AC */ jal func_80054AB0
|
|
/* 2F234 80053E34 00D13024 */ and $a2, $a2, $s1
|
|
/* 2F238 80053E38 24050040 */ addiu $a1, $zero, 0x40
|
|
/* 2F23C 80053E3C 27A60010 */ addiu $a2, $sp, 0x10
|
|
/* 2F240 80053E40 02B41021 */ addu $v0, $s5, $s4
|
|
/* 2F244 80053E44 AE500018 */ sw $s0, 0x18($s2)
|
|
/* 2F248 80053E48 90430003 */ lbu $v1, 3($v0)
|
|
/* 2F24C 80053E4C 8E62003C */ lw $v0, 0x3c($s3)
|
|
/* 2F250 80053E50 00031840 */ sll $v1, $v1, 1
|
|
/* 2F254 80053E54 00621821 */ addu $v1, $v1, $v0
|
|
/* 2F258 80053E58 8FA20014 */ lw $v0, 0x14($sp)
|
|
/* 2F25C 80053E5C 94640000 */ lhu $a0, ($v1)
|
|
/* 2F260 80053E60 00451021 */ addu $v0, $v0, $a1
|
|
/* 2F264 80053E64 00511024 */ and $v0, $v0, $s1
|
|
/* 2F268 80053E68 0C01504B */ jal func_8005412C
|
|
/* 2F26C 80053E6C 02028021 */ addu $s0, $s0, $v0
|
|
/* 2F270 80053E70 14400017 */ bnez $v0, .L80053ED0
|
|
/* 2F274 80053E74 00000000 */ nop
|
|
/* 2F278 80053E78 0200282D */ daddu $a1, $s0, $zero
|
|
/* 2F27C 80053E7C 8FA60014 */ lw $a2, 0x14($sp)
|
|
/* 2F280 80053E80 8FA40010 */ lw $a0, 0x10($sp)
|
|
/* 2F284 80053E84 0C0152AC */ jal func_80054AB0
|
|
/* 2F288 80053E88 00D13024 */ and $a2, $a2, $s1
|
|
/* 2F28C 80053E8C 24050030 */ addiu $a1, $zero, 0x30
|
|
/* 2F290 80053E90 24020004 */ addiu $v0, $zero, 4
|
|
/* 2F294 80053E94 A2420020 */ sb $v0, 0x20($s2)
|
|
/* 2F298 80053E98 02B41021 */ addu $v0, $s5, $s4
|
|
/* 2F29C 80053E9C AE50001C */ sw $s0, 0x1c($s2)
|
|
/* 2F2A0 80053EA0 90420004 */ lbu $v0, 4($v0)
|
|
/* 2F2A4 80053EA4 8E63003C */ lw $v1, 0x3c($s3)
|
|
/* 2F2A8 80053EA8 00021040 */ sll $v0, $v0, 1
|
|
/* 2F2AC 80053EAC 00431021 */ addu $v0, $v0, $v1
|
|
/* 2F2B0 80053EB0 94440000 */ lhu $a0, ($v0)
|
|
/* 2F2B4 80053EB4 0C01504B */ jal func_8005412C
|
|
/* 2F2B8 80053EB8 27A60010 */ addiu $a2, $sp, 0x10
|
|
/* 2F2BC 80053EBC 14400004 */ bnez $v0, .L80053ED0
|
|
/* 2F2C0 80053EC0 00000000 */ nop
|
|
/* 2F2C4 80053EC4 8FA40010 */ lw $a0, 0x10($sp)
|
|
/* 2F2C8 80053EC8 0C01523F */ jal func_800548FC
|
|
/* 2F2CC 80053ECC 24050002 */ addiu $a1, $zero, 2
|
|
.L80053ED0:
|
|
/* 2F2D0 80053ED0 8FBF0030 */ lw $ra, 0x30($sp)
|
|
/* 2F2D4 80053ED4 8FB5002C */ lw $s5, 0x2c($sp)
|
|
/* 2F2D8 80053ED8 8FB40028 */ lw $s4, 0x28($sp)
|
|
/* 2F2DC 80053EDC 8FB30024 */ lw $s3, 0x24($sp)
|
|
/* 2F2E0 80053EE0 8FB20020 */ lw $s2, 0x20($sp)
|
|
/* 2F2E4 80053EE4 8FB1001C */ lw $s1, 0x1c($sp)
|
|
/* 2F2E8 80053EE8 8FB00018 */ lw $s0, 0x18($sp)
|
|
/* 2F2EC 80053EEC 0000102D */ daddu $v0, $zero, $zero
|
|
/* 2F2F0 80053EF0 03E00008 */ jr $ra
|
|
/* 2F2F4 80053EF4 27BD0038 */ addiu $sp, $sp, 0x38
|