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>
32 lines
1.5 KiB
ArmAsm
32 lines
1.5 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel CloseActionCommandInfo
|
|
/* 197CF0 80269410 27BDFFE8 */ addiu $sp, $sp, -0x18
|
|
/* 197CF4 80269414 10A0000D */ beqz $a1, .L8026944C
|
|
/* 197CF8 80269418 AFBF0010 */ sw $ra, 0x10($sp)
|
|
/* 197CFC 8026941C 3C02802A */ lui $v0, %hi(D_8029FBE0)
|
|
/* 197D00 80269420 2442FBE0 */ addiu $v0, $v0, %lo(D_8029FBE0)
|
|
/* 197D04 80269424 8443004A */ lh $v1, 0x4a($v0)
|
|
/* 197D08 80269428 28620007 */ slti $v0, $v1, 7
|
|
/* 197D0C 8026942C 10400003 */ beqz $v0, .L8026943C
|
|
/* 197D10 80269430 28620005 */ slti $v0, $v1, 5
|
|
/* 197D14 80269434 1040000B */ beqz $v0, .L80269464
|
|
/* 197D18 80269438 24020002 */ addiu $v0, $zero, 2
|
|
.L8026943C:
|
|
/* 197D1C 8026943C 0C09A327 */ jal func_80268C9C
|
|
/* 197D20 80269440 00000000 */ nop
|
|
/* 197D24 80269444 0809A519 */ j .L80269464
|
|
/* 197D28 80269448 0000102D */ daddu $v0, $zero, $zero
|
|
.L8026944C:
|
|
/* 197D2C 8026944C 3C048000 */ lui $a0, 0x8000
|
|
/* 197D30 80269450 0C05271B */ jal sfx_stop_sound
|
|
/* 197D34 80269454 34840041 */ ori $a0, $a0, 0x41
|
|
/* 197D38 80269458 0C093EC3 */ jal close_action_command_instruction_popup
|
|
/* 197D3C 8026945C 00000000 */ nop
|
|
/* 197D40 80269460 24020002 */ addiu $v0, $zero, 2
|
|
.L80269464:
|
|
/* 197D44 80269464 8FBF0010 */ lw $ra, 0x10($sp)
|
|
/* 197D48 80269468 03E00008 */ jr $ra
|
|
/* 197D4C 8026946C 27BD0018 */ addiu $sp, $sp, 0x18
|