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>
45 lines
2.2 KiB
ArmAsm
45 lines
2.2 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_80054EF0
|
|
/* 302F0 80054EF0 27BDFFE0 */ addiu $sp, $sp, -0x20
|
|
/* 302F4 80054EF4 0080582D */ daddu $t3, $a0, $zero
|
|
/* 302F8 80054EF8 00C0502D */ daddu $t2, $a2, $zero
|
|
/* 302FC 80054EFC 00E0402D */ daddu $t0, $a3, $zero
|
|
/* 30300 80054F00 0100382D */ daddu $a3, $t0, $zero
|
|
/* 30304 80054F04 30A500FF */ andi $a1, $a1, 0xff
|
|
/* 30308 80054F08 00051A00 */ sll $v1, $a1, 8
|
|
/* 3030C 80054F0C 3C04800A */ lui $a0, %hi(D_8009A620)
|
|
/* 30310 80054F10 8C84A620 */ lw $a0, %lo(D_8009A620)($a0)
|
|
/* 30314 80054F14 0060482D */ daddu $t1, $v1, $zero
|
|
/* 30318 80054F18 10A00002 */ beqz $a1, .L80054F24
|
|
/* 3031C 80054F1C AFBF0018 */ sw $ra, 0x18($sp)
|
|
/* 30320 80054F20 346900FF */ ori $t1, $v1, 0xff
|
|
.L80054F24:
|
|
/* 30324 80054F24 00061600 */ sll $v0, $a2, 0x18
|
|
/* 30328 80054F28 04420001 */ bltzl $v0, .L80054F30
|
|
/* 3032C 80054F2C 240A007F */ addiu $t2, $zero, 0x7f
|
|
.L80054F30:
|
|
/* 30330 80054F30 00081400 */ sll $v0, $t0, 0x10
|
|
/* 30334 80054F34 00021C03 */ sra $v1, $v0, 0x10
|
|
/* 30338 80054F38 28620961 */ slti $v0, $v1, 0x961
|
|
/* 3033C 80054F3C 14400003 */ bnez $v0, .L80054F4C
|
|
/* 30340 80054F40 2862F6A0 */ slti $v0, $v1, -0x960
|
|
/* 30344 80054F44 080153D5 */ j .L80054F54
|
|
/* 30348 80054F48 24070960 */ addiu $a3, $zero, 0x960
|
|
.L80054F4C:
|
|
/* 3034C 80054F4C 54400001 */ bnel $v0, $zero, .L80054F54
|
|
/* 30350 80054F50 2407F6A0 */ addiu $a3, $zero, -0x960
|
|
.L80054F54:
|
|
/* 30354 80054F54 314200FF */ andi $v0, $t2, 0xff
|
|
/* 30358 80054F58 00093400 */ sll $a2, $t1, 0x10
|
|
/* 3035C 80054F5C 00073C00 */ sll $a3, $a3, 0x10
|
|
/* 30360 80054F60 0160282D */ daddu $a1, $t3, $zero
|
|
/* 30364 80054F64 00063403 */ sra $a2, $a2, 0x10
|
|
/* 30368 80054F68 00073C03 */ sra $a3, $a3, 0x10
|
|
/* 3036C 80054F6C 0C012CE2 */ jal func_8004B388
|
|
/* 30370 80054F70 AFA20010 */ sw $v0, 0x10($sp)
|
|
/* 30374 80054F74 8FBF0018 */ lw $ra, 0x18($sp)
|
|
/* 30378 80054F78 03E00008 */ jr $ra
|
|
/* 3037C 80054F7C 27BD0020 */ addiu $sp, $sp, 0x20
|