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>
44 lines
2.2 KiB
ArmAsm
44 lines
2.2 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel func_80054CE0
|
|
/* 300E0 80054CE0 27BDFFE0 */ addiu $sp, $sp, -0x20
|
|
/* 300E4 80054CE4 AFB10014 */ sw $s1, 0x14($sp)
|
|
/* 300E8 80054CE8 0080882D */ daddu $s1, $a0, $zero
|
|
/* 300EC 80054CEC 2CA20009 */ sltiu $v0, $a1, 9
|
|
/* 300F0 80054CF0 AFBF0018 */ sw $ra, 0x18($sp)
|
|
/* 300F4 80054CF4 1040001A */ beqz $v0, .L80054D60
|
|
/* 300F8 80054CF8 AFB00010 */ sw $s0, 0x10($sp)
|
|
/* 300FC 80054CFC 00051040 */ sll $v0, $a1, 1
|
|
/* 30100 80054D00 3C108008 */ lui $s0, %hi(D_80078530)
|
|
/* 30104 80054D04 02028021 */ addu $s0, $s0, $v0
|
|
/* 30108 80054D08 96108530 */ lhu $s0, %lo(D_80078530)($s0)
|
|
/* 3010C 80054D0C 32220001 */ andi $v0, $s1, 1
|
|
/* 30110 80054D10 1040000C */ beqz $v0, .L80054D44
|
|
/* 30114 80054D14 32220010 */ andi $v0, $s1, 0x10
|
|
/* 30118 80054D18 3C02800A */ lui $v0, %hi(D_8009A664)
|
|
/* 3011C 80054D1C 8C42A664 */ lw $v0, %lo(D_8009A664)($v0)
|
|
/* 30120 80054D20 2444002C */ addiu $a0, $v0, 0x2c
|
|
/* 30124 80054D24 0C014EB2 */ jal func_80053AC8
|
|
/* 30128 80054D28 AC500048 */ sw $s0, 0x48($v0)
|
|
/* 3012C 80054D2C 3C02800A */ lui $v0, %hi(D_8009A5FC)
|
|
/* 30130 80054D30 8C42A5FC */ lw $v0, %lo(D_8009A5FC)($v0)
|
|
/* 30134 80054D34 2444002C */ addiu $a0, $v0, 0x2c
|
|
/* 30138 80054D38 0C014EB2 */ jal func_80053AC8
|
|
/* 3013C 80054D3C AC500048 */ sw $s0, 0x48($v0)
|
|
/* 30140 80054D40 32220010 */ andi $v0, $s1, 0x10
|
|
.L80054D44:
|
|
/* 30144 80054D44 10400006 */ beqz $v0, .L80054D60
|
|
/* 30148 80054D48 00000000 */ nop
|
|
/* 3014C 80054D4C 3C02800A */ lui $v0, %hi(D_8009A640)
|
|
/* 30150 80054D50 8C42A640 */ lw $v0, %lo(D_8009A640)($v0)
|
|
/* 30154 80054D54 24440040 */ addiu $a0, $v0, 0x40
|
|
/* 30158 80054D58 0C014EB2 */ jal func_80053AC8
|
|
/* 3015C 80054D5C AC50005C */ sw $s0, 0x5c($v0)
|
|
.L80054D60:
|
|
/* 30160 80054D60 8FBF0018 */ lw $ra, 0x18($sp)
|
|
/* 30164 80054D64 8FB10014 */ lw $s1, 0x14($sp)
|
|
/* 30168 80054D68 8FB00010 */ lw $s0, 0x10($sp)
|
|
/* 3016C 80054D6C 03E00008 */ jr $ra
|
|
/* 30170 80054D70 27BD0020 */ addiu $sp, $sp, 0x20
|