papermario/ver/jp/asm/nonmatchings/20B80/func_80047754.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

30 lines
1.4 KiB
ArmAsm

.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80047754
/* 22B54 80047754 00041040 */ sll $v0, $a0, 1
/* 22B58 80047758 00441021 */ addu $v0, $v0, $a0
/* 22B5C 8004775C 00021080 */ sll $v0, $v0, 2
/* 22B60 80047760 00441023 */ subu $v0, $v0, $a0
/* 22B64 80047764 3C03800A */ lui $v1, %hi(D_8009ED54)
/* 22B68 80047768 8C63ED54 */ lw $v1, %lo(D_8009ED54)($v1)
/* 22B6C 8004776C 00021100 */ sll $v0, $v0, 4
/* 22B70 80047770 00622021 */ addu $a0, $v1, $v0
/* 22B74 80047774 80820058 */ lb $v0, 0x58($a0)
/* 22B78 80047778 1040000C */ beqz $v0, .L800477AC
/* 22B7C 8004777C 90830058 */ lbu $v1, 0x58($a0)
/* 22B80 80047780 80820059 */ lb $v0, 0x59($a0)
/* 22B84 80047784 14400009 */ bnez $v0, .L800477AC
/* 22B88 80047788 24020001 */ addiu $v0, $zero, 1
/* 22B8C 8004778C A0830059 */ sb $v1, 0x59($a0)
/* 22B90 80047790 8C830060 */ lw $v1, 0x60($a0)
/* 22B94 80047794 A082005B */ sb $v0, 0x5b($a0)
/* 22B98 80047798 2402000A */ addiu $v0, $zero, 0xa
/* 22B9C 8004779C A0800058 */ sb $zero, 0x58($a0)
/* 22BA0 800477A0 A080005A */ sb $zero, 0x5a($a0)
/* 22BA4 800477A4 A082005D */ sb $v0, 0x5d($a0)
/* 22BA8 800477A8 AC830064 */ sw $v1, 0x64($a0)
.L800477AC:
/* 22BAC 800477AC 03E00008 */ jr $ra
/* 22BB0 800477B0 00000000 */ nop