papermario/ver/jp/asm/nonmatchings/47AC0/func_8006C710.s
Ethan Roseman 3315d6010f
Splat refactor (#257)
* 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>
2021-04-13 16:47:52 +09:00

44 lines
2.1 KiB
ArmAsm

.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8006C710
/* 47B10 8006C710 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 47B14 8006C714 AFB20018 */ sw $s2, 0x18($sp)
/* 47B18 8006C718 00809021 */ addu $s2, $a0, $zero
/* 47B1C 8006C71C AFB00010 */ sw $s0, 0x10($sp)
/* 47B20 8006C720 00A08021 */ addu $s0, $a1, $zero
/* 47B24 8006C724 AFB10014 */ sw $s1, 0x14($sp)
/* 47B28 8006C728 00C08821 */ addu $s1, $a2, $zero
/* 47B2C 8006C72C AFB3001C */ sw $s3, 0x1c($sp)
/* 47B30 8006C730 AFBF0020 */ sw $ra, 0x20($sp)
/* 47B34 8006C734 0C01B1A8 */ jal func_8006C6A0
/* 47B38 8006C738 00E09821 */ addu $s3, $a3, $zero
/* 47B3C 8006C73C 14400010 */ bnez $v0, .L8006C780
/* 47B40 8006C740 2402FFFF */ addiu $v0, $zero, -1
/* 47B44 8006C744 3C02A404 */ lui $v0, 0xa404
/* 47B48 8006C748 02202021 */ addu $a0, $s1, $zero
/* 47B4C 8006C74C 0C018798 */ jal func_80061E60
/* 47B50 8006C750 AC500000 */ sw $s0, ($v0)
/* 47B54 8006C754 3C03A404 */ lui $v1, 0xa404
/* 47B58 8006C758 34630004 */ ori $v1, $v1, 4
/* 47B5C 8006C75C AC620000 */ sw $v0, ($v1)
/* 47B60 8006C760 16400003 */ bnez $s2, .L8006C770
/* 47B64 8006C764 3C03A404 */ lui $v1, 0xa404
/* 47B68 8006C768 0801B1DD */ j .L8006C774
/* 47B6C 8006C76C 3463000C */ ori $v1, $v1, 0xc
.L8006C770:
/* 47B70 8006C770 34630008 */ ori $v1, $v1, 8
.L8006C774:
/* 47B74 8006C774 2662FFFF */ addiu $v0, $s3, -1
/* 47B78 8006C778 AC620000 */ sw $v0, ($v1)
/* 47B7C 8006C77C 00001021 */ addu $v0, $zero, $zero
.L8006C780:
/* 47B80 8006C780 8FBF0020 */ lw $ra, 0x20($sp)
/* 47B84 8006C784 8FB3001C */ lw $s3, 0x1c($sp)
/* 47B88 8006C788 8FB20018 */ lw $s2, 0x18($sp)
/* 47B8C 8006C78C 8FB10014 */ lw $s1, 0x14($sp)
/* 47B90 8006C790 8FB00010 */ lw $s0, 0x10($sp)
/* 47B94 8006C794 03E00008 */ jr $ra
/* 47B98 8006C798 27BD0028 */ addiu $sp, $sp, 0x28
/* 47B9C 8006C79C 00000000 */ nop