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>
109 lines
5.1 KiB
ArmAsm
109 lines
5.1 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_8006B550
|
|
/* 46950 8006B550 3C02A460 */ lui $v0, 0xa460
|
|
/* 46954 8006B554 34420010 */ ori $v0, $v0, 0x10
|
|
/* 46958 8006B558 8C420000 */ lw $v0, ($v0)
|
|
/* 4695C 8006B55C 30420003 */ andi $v0, $v0, 3
|
|
/* 46960 8006B560 10400006 */ beqz $v0, .L8006B57C
|
|
/* 46964 8006B564 3C03A460 */ lui $v1, 0xa460
|
|
/* 46968 8006B568 34630010 */ ori $v1, $v1, 0x10
|
|
.L8006B56C:
|
|
/* 4696C 8006B56C 8C620000 */ lw $v0, ($v1)
|
|
/* 46970 8006B570 30420003 */ andi $v0, $v0, 3
|
|
/* 46974 8006B574 1440FFFD */ bnez $v0, .L8006B56C
|
|
/* 46978 8006B578 00000000 */ nop
|
|
.L8006B57C:
|
|
/* 4697C 8006B57C 90880009 */ lbu $t0, 9($a0)
|
|
/* 46980 8006B580 00081080 */ sll $v0, $t0, 2
|
|
/* 46984 8006B584 3C078009 */ lui $a3, %hi(D_80093D50)
|
|
/* 46988 8006B588 00E23821 */ addu $a3, $a3, $v0
|
|
/* 4698C 8006B58C 8CE73D50 */ lw $a3, %lo(D_80093D50)($a3)
|
|
/* 46990 8006B590 90820004 */ lbu $v0, 4($a0)
|
|
/* 46994 8006B594 90E30004 */ lbu $v1, 4($a3)
|
|
/* 46998 8006B598 1062003F */ beq $v1, $v0, .L8006B698
|
|
/* 4699C 8006B59C 00000000 */ nop
|
|
/* 469A0 8006B5A0 1500001A */ bnez $t0, .L8006B60C
|
|
/* 469A4 8006B5A4 00E01821 */ addu $v1, $a3, $zero
|
|
/* 469A8 8006B5A8 90620005 */ lbu $v0, 5($v1)
|
|
/* 469AC 8006B5AC 90870005 */ lbu $a3, 5($a0)
|
|
/* 469B0 8006B5B0 10470003 */ beq $v0, $a3, .L8006B5C0
|
|
/* 469B4 8006B5B4 3C02A460 */ lui $v0, 0xa460
|
|
/* 469B8 8006B5B8 34420014 */ ori $v0, $v0, 0x14
|
|
/* 469BC 8006B5BC AC470000 */ sw $a3, ($v0)
|
|
.L8006B5C0:
|
|
/* 469C0 8006B5C0 90620006 */ lbu $v0, 6($v1)
|
|
/* 469C4 8006B5C4 90870006 */ lbu $a3, 6($a0)
|
|
/* 469C8 8006B5C8 10470003 */ beq $v0, $a3, .L8006B5D8
|
|
/* 469CC 8006B5CC 3C02A460 */ lui $v0, 0xa460
|
|
/* 469D0 8006B5D0 3442001C */ ori $v0, $v0, 0x1c
|
|
/* 469D4 8006B5D4 AC470000 */ sw $a3, ($v0)
|
|
.L8006B5D8:
|
|
/* 469D8 8006B5D8 90620007 */ lbu $v0, 7($v1)
|
|
/* 469DC 8006B5DC 90870007 */ lbu $a3, 7($a0)
|
|
/* 469E0 8006B5E0 10470003 */ beq $v0, $a3, .L8006B5F0
|
|
/* 469E4 8006B5E4 3C02A460 */ lui $v0, 0xa460
|
|
/* 469E8 8006B5E8 34420020 */ ori $v0, $v0, 0x20
|
|
/* 469EC 8006B5EC AC470000 */ sw $a3, ($v0)
|
|
.L8006B5F0:
|
|
/* 469F0 8006B5F0 90620008 */ lbu $v0, 8($v1)
|
|
/* 469F4 8006B5F4 90870008 */ lbu $a3, 8($a0)
|
|
/* 469F8 8006B5F8 1047001D */ beq $v0, $a3, .L8006B670
|
|
/* 469FC 8006B5FC 00000000 */ nop
|
|
/* 46A00 8006B600 3C02A460 */ lui $v0, 0xa460
|
|
/* 46A04 8006B604 0801AD9B */ j .L8006B66C
|
|
/* 46A08 8006B608 34420018 */ ori $v0, $v0, 0x18
|
|
.L8006B60C:
|
|
/* 46A0C 8006B60C 90620005 */ lbu $v0, 5($v1)
|
|
/* 46A10 8006B610 90870005 */ lbu $a3, 5($a0)
|
|
/* 46A14 8006B614 10470003 */ beq $v0, $a3, .L8006B624
|
|
/* 46A18 8006B618 3C02A460 */ lui $v0, 0xa460
|
|
/* 46A1C 8006B61C 34420024 */ ori $v0, $v0, 0x24
|
|
/* 46A20 8006B620 AC470000 */ sw $a3, ($v0)
|
|
.L8006B624:
|
|
/* 46A24 8006B624 90620006 */ lbu $v0, 6($v1)
|
|
/* 46A28 8006B628 90870006 */ lbu $a3, 6($a0)
|
|
/* 46A2C 8006B62C 10470003 */ beq $v0, $a3, .L8006B63C
|
|
/* 46A30 8006B630 3C02A460 */ lui $v0, 0xa460
|
|
/* 46A34 8006B634 3442002C */ ori $v0, $v0, 0x2c
|
|
/* 46A38 8006B638 AC470000 */ sw $a3, ($v0)
|
|
.L8006B63C:
|
|
/* 46A3C 8006B63C 90620007 */ lbu $v0, 7($v1)
|
|
/* 46A40 8006B640 90870007 */ lbu $a3, 7($a0)
|
|
/* 46A44 8006B644 10470003 */ beq $v0, $a3, .L8006B654
|
|
/* 46A48 8006B648 3C02A460 */ lui $v0, 0xa460
|
|
/* 46A4C 8006B64C 34420030 */ ori $v0, $v0, 0x30
|
|
/* 46A50 8006B650 AC470000 */ sw $a3, ($v0)
|
|
.L8006B654:
|
|
/* 46A54 8006B654 90620008 */ lbu $v0, 8($v1)
|
|
/* 46A58 8006B658 90870008 */ lbu $a3, 8($a0)
|
|
/* 46A5C 8006B65C 10470004 */ beq $v0, $a3, .L8006B670
|
|
/* 46A60 8006B660 00000000 */ nop
|
|
/* 46A64 8006B664 3C02A460 */ lui $v0, 0xa460
|
|
/* 46A68 8006B668 34420028 */ ori $v0, $v0, 0x28
|
|
.L8006B66C:
|
|
/* 46A6C 8006B66C AC470000 */ sw $a3, ($v0)
|
|
.L8006B670:
|
|
/* 46A70 8006B670 90820004 */ lbu $v0, 4($a0)
|
|
/* 46A74 8006B674 A0620004 */ sb $v0, 4($v1)
|
|
/* 46A78 8006B678 90820005 */ lbu $v0, 5($a0)
|
|
/* 46A7C 8006B67C A0620005 */ sb $v0, 5($v1)
|
|
/* 46A80 8006B680 90820006 */ lbu $v0, 6($a0)
|
|
/* 46A84 8006B684 A0620006 */ sb $v0, 6($v1)
|
|
/* 46A88 8006B688 90820007 */ lbu $v0, 7($a0)
|
|
/* 46A8C 8006B68C A0620007 */ sb $v0, 7($v1)
|
|
/* 46A90 8006B690 90820008 */ lbu $v0, 8($a0)
|
|
/* 46A94 8006B694 A0620008 */ sb $v0, 8($v1)
|
|
.L8006B698:
|
|
/* 46A98 8006B698 8C82000C */ lw $v0, 0xc($a0)
|
|
/* 46A9C 8006B69C 3C03A000 */ lui $v1, 0xa000
|
|
/* 46AA0 8006B6A0 00451025 */ or $v0, $v0, $a1
|
|
/* 46AA4 8006B6A4 00431025 */ or $v0, $v0, $v1
|
|
/* 46AA8 8006B6A8 8C420000 */ lw $v0, ($v0)
|
|
/* 46AAC 8006B6AC ACC20000 */ sw $v0, ($a2)
|
|
/* 46AB0 8006B6B0 03E00008 */ jr $ra
|
|
/* 46AB4 8006B6B4 00001021 */ addu $v0, $zero, $zero
|
|
/* 46AB8 8006B6B8 00000000 */ nop
|
|
/* 46ABC 8006B6BC 00000000 */ nop
|