mirror of
https://github.com/pmret/papermario.git
synced 2024-11-14 15:03:25 +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>
33 lines
1.5 KiB
ArmAsm
33 lines
1.5 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_8014AD40
|
|
/* E1440 8014AD40 27BDFFE0 */ addiu $sp, $sp, -0x20
|
|
/* E1444 8014AD44 AFB00010 */ sw $s0, 0x10($sp)
|
|
/* E1448 8014AD48 3C108016 */ lui $s0, %hi(gMusicSettings)
|
|
/* E144C 8014AD4C 26109AF0 */ addiu $s0, $s0, %lo(gMusicSettings)
|
|
/* E1450 8014AD50 AFB10014 */ sw $s1, 0x14($sp)
|
|
/* E1454 8014AD54 0000882D */ daddu $s1, $zero, $zero
|
|
/* E1458 8014AD58 AFBF0018 */ sw $ra, 0x18($sp)
|
|
.L8014AD5C:
|
|
/* E145C 8014AD5C 96020000 */ lhu $v0, ($s0)
|
|
/* E1460 8014AD60 30420001 */ andi $v0, $v0, 1
|
|
/* E1464 8014AD64 10400006 */ beqz $v0, .L8014AD80
|
|
/* E1468 8014AD68 26310001 */ addiu $s1, $s1, 1
|
|
/* E146C 8014AD6C 8E040018 */ lw $a0, 0x18($s0)
|
|
/* E1470 8014AD70 0C01567F */ jal func_800559FC
|
|
/* E1474 8014AD74 00000000 */ nop
|
|
/* E1478 8014AD78 14400005 */ bnez $v0, .L8014AD90
|
|
/* E147C 8014AD7C 24020001 */ addiu $v0, $zero, 1
|
|
.L8014AD80:
|
|
/* E1480 8014AD80 2A220002 */ slti $v0, $s1, 2
|
|
/* E1484 8014AD84 1440FFF5 */ bnez $v0, .L8014AD5C
|
|
/* E1488 8014AD88 26100030 */ addiu $s0, $s0, 0x30
|
|
/* E148C 8014AD8C 0000102D */ daddu $v0, $zero, $zero
|
|
.L8014AD90:
|
|
/* E1490 8014AD90 8FBF0018 */ lw $ra, 0x18($sp)
|
|
/* E1494 8014AD94 8FB10014 */ lw $s1, 0x14($sp)
|
|
/* E1498 8014AD98 8FB00010 */ lw $s0, 0x10($sp)
|
|
/* E149C 8014AD9C 03E00008 */ jr $ra
|
|
/* E14A0 8014ADA0 27BD0020 */ addiu $sp, $sp, 0x20
|