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.4 KiB
ArmAsm
50 lines
2.4 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_80054D18
|
|
/* 30118 80054D18 27BDFFE8 */ addiu $sp, $sp, -0x18
|
|
/* 3011C 80054D1C AFB00010 */ sw $s0, 0x10($sp)
|
|
/* 30120 80054D20 0080802D */ daddu $s0, $a0, $zero
|
|
/* 30124 80054D24 3203000F */ andi $v1, $s0, 0xf
|
|
/* 30128 80054D28 3C048008 */ lui $a0, %hi(D_80078D84)
|
|
/* 3012C 80054D2C 94848D84 */ lhu $a0, %lo(D_80078D84)($a0)
|
|
/* 30130 80054D30 24020001 */ addiu $v0, $zero, 1
|
|
/* 30134 80054D34 1482001E */ bne $a0, $v0, .L80054DB0
|
|
/* 30138 80054D38 AFBF0014 */ sw $ra, 0x14($sp)
|
|
/* 3013C 80054D3C 2C620004 */ sltiu $v0, $v1, 4
|
|
/* 30140 80054D40 10400007 */ beqz $v0, .L80054D60
|
|
/* 30144 80054D44 2C620002 */ sltiu $v0, $v1, 2
|
|
/* 30148 80054D48 10400019 */ beqz $v0, .L80054DB0
|
|
/* 3014C 80054D4C 00000000 */ nop
|
|
/* 30150 80054D50 1064000C */ beq $v1, $a0, .L80054D84
|
|
/* 30154 80054D54 00102102 */ srl $a0, $s0, 4
|
|
/* 30158 80054D58 0801536C */ j .L80054DB0
|
|
/* 3015C 80054D5C 00000000 */ nop
|
|
.L80054D60:
|
|
/* 30160 80054D60 24020004 */ addiu $v0, $zero, 4
|
|
/* 30164 80054D64 14620012 */ bne $v1, $v0, .L80054DB0
|
|
/* 30168 80054D68 00502006 */ srlv $a0, $s0, $v0
|
|
/* 3016C 80054D6C 0000282D */ daddu $a1, $zero, $zero
|
|
/* 30170 80054D70 00A0302D */ daddu $a2, $a1, $zero
|
|
/* 30174 80054D74 0C0153BC */ jal func_80054EF0
|
|
/* 30178 80054D78 00A0382D */ daddu $a3, $a1, $zero
|
|
/* 3017C 80054D7C 0801536C */ j .L80054DB0
|
|
/* 30180 80054D80 00000000 */ nop
|
|
.L80054D84:
|
|
/* 30184 80054D84 308400FF */ andi $a0, $a0, 0xff
|
|
/* 30188 80054D88 0C015561 */ jal func_80055584
|
|
/* 3018C 80054D8C 0000282D */ daddu $a1, $zero, $zero
|
|
/* 30190 80054D90 3C033020 */ lui $v1, 0x3020
|
|
/* 30194 80054D94 34632000 */ ori $v1, $v1, 0x2000
|
|
/* 30198 80054D98 0062182B */ sltu $v1, $v1, $v0
|
|
/* 3019C 80054D9C 10600004 */ beqz $v1, .L80054DB0
|
|
/* 301A0 80054DA0 0040202D */ daddu $a0, $v0, $zero
|
|
/* 301A4 80054DA4 00102B02 */ srl $a1, $s0, 0xc
|
|
/* 301A8 80054DA8 0C015588 */ jal func_80055620
|
|
/* 301AC 80054DAC 30A50003 */ andi $a1, $a1, 3
|
|
.L80054DB0:
|
|
/* 301B0 80054DB0 8FBF0014 */ lw $ra, 0x14($sp)
|
|
/* 301B4 80054DB4 8FB00010 */ lw $s0, 0x10($sp)
|
|
/* 301B8 80054DB8 03E00008 */ jr $ra
|
|
/* 301BC 80054DBC 27BD0018 */ addiu $sp, $sp, 0x18
|