papermario/ver/jp/asm/nonmatchings/13530/func_8003A860.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

29 lines
1.3 KiB
ArmAsm

.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8003A860
/* 15C60 8003A860 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 15C64 8003A864 AFB00010 */ sw $s0, 0x10($sp)
/* 15C68 8003A868 0080802D */ daddu $s0, $a0, $zero
/* 15C6C 8003A86C AFBF0014 */ sw $ra, 0x14($sp)
/* 15C70 8003A870 8E020000 */ lw $v0, ($s0)
/* 15C74 8003A874 30420010 */ andi $v0, $v0, 0x10
/* 15C78 8003A878 1440000C */ bnez $v0, .L8003A8AC
/* 15C7C 8003A87C 00000000 */ nop
/* 15C80 8003A880 0C045605 */ jal func_80115814
/* 15C84 8003A884 8E040078 */ lw $a0, 0x78($s0)
/* 15C88 8003A888 3C050001 */ lui $a1, 1
/* 15C8C 8003A88C 8C430000 */ lw $v1, ($v0)
/* 15C90 8003A890 2404FFFE */ addiu $a0, $zero, -2
/* 15C94 8003A894 00641824 */ and $v1, $v1, $a0
/* 15C98 8003A898 AC430000 */ sw $v1, ($v0)
/* 15C9C 8003A89C 8E020000 */ lw $v0, ($s0)
/* 15CA0 8003A8A0 34A50010 */ ori $a1, $a1, 0x10
/* 15CA4 8003A8A4 00451025 */ or $v0, $v0, $a1
/* 15CA8 8003A8A8 AE020000 */ sw $v0, ($s0)
.L8003A8AC:
/* 15CAC 8003A8AC 8FBF0014 */ lw $ra, 0x14($sp)
/* 15CB0 8003A8B0 8FB00010 */ lw $s0, 0x10($sp)
/* 15CB4 8003A8B4 03E00008 */ jr $ra
/* 15CB8 8003A8B8 27BD0018 */ addiu $sp, $sp, 0x18