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>
44 lines
2.1 KiB
ArmAsm
44 lines
2.1 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_800554F8
|
|
/* 308F8 800554F8 27BDFFE0 */ addiu $sp, $sp, -0x20
|
|
/* 308FC 800554FC AFB10014 */ sw $s1, 0x14($sp)
|
|
/* 30900 80055500 0080882D */ daddu $s1, $a0, $zero
|
|
/* 30904 80055504 3C028008 */ lui $v0, %hi(D_80078D86)
|
|
/* 30908 80055508 94428D86 */ lhu $v0, %lo(D_80078D86)($v0)
|
|
/* 3090C 8005550C 0000182D */ daddu $v1, $zero, $zero
|
|
/* 30910 80055510 AFB20018 */ sw $s2, 0x18($sp)
|
|
/* 30914 80055514 24120004 */ addiu $s2, $zero, 4
|
|
/* 30918 80055518 AFBF001C */ sw $ra, 0x1c($sp)
|
|
/* 3091C 8005551C 12220012 */ beq $s1, $v0, .L80055568
|
|
/* 30920 80055520 AFB00010 */ sw $s0, 0x10($sp)
|
|
/* 30924 80055524 0060802D */ daddu $s0, $v1, $zero
|
|
.L80055528:
|
|
/* 30928 80055528 16110005 */ bne $s0, $s1, .L80055540
|
|
/* 3092C 8005552C 00000000 */ nop
|
|
/* 30930 80055530 0C0154F2 */ jal func_800553C8
|
|
/* 30934 80055534 0220202D */ daddu $a0, $s1, $zero
|
|
/* 30938 80055538 08015553 */ j .L8005554C
|
|
/* 3093C 8005553C 0040182D */ daddu $v1, $v0, $zero
|
|
.L80055540:
|
|
/* 30940 80055540 0C0154E0 */ jal func_80055380
|
|
/* 30944 80055544 0200202D */ daddu $a0, $s0, $zero
|
|
/* 30948 80055548 0040182D */ daddu $v1, $v0, $zero
|
|
.L8005554C:
|
|
/* 3094C 8005554C 14600006 */ bnez $v1, .L80055568
|
|
/* 30950 80055550 26100001 */ addiu $s0, $s0, 1
|
|
/* 30954 80055554 0212102B */ sltu $v0, $s0, $s2
|
|
/* 30958 80055558 1440FFF3 */ bnez $v0, .L80055528
|
|
/* 3095C 8005555C 00000000 */ nop
|
|
/* 30960 80055560 3C018008 */ lui $at, %hi(D_80078D86)
|
|
/* 30964 80055564 A4318D86 */ sh $s1, %lo(D_80078D86)($at)
|
|
.L80055568:
|
|
/* 30968 80055568 8FBF001C */ lw $ra, 0x1c($sp)
|
|
/* 3096C 8005556C 8FB20018 */ lw $s2, 0x18($sp)
|
|
/* 30970 80055570 8FB10014 */ lw $s1, 0x14($sp)
|
|
/* 30974 80055574 8FB00010 */ lw $s0, 0x10($sp)
|
|
/* 30978 80055578 0060102D */ daddu $v0, $v1, $zero
|
|
/* 3097C 8005557C 03E00008 */ jr $ra
|
|
/* 30980 80055580 27BD0020 */ addiu $sp, $sp, 0x20
|