papermario/ver/jp/asm/nonmatchings/20B80/func_80047830.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_80047830
/* 22C30 80047830 00041040 */ sll $v0, $a0, 1
/* 22C34 80047834 00441021 */ addu $v0, $v0, $a0
/* 22C38 80047838 00021080 */ sll $v0, $v0, 2
/* 22C3C 8004783C 00441023 */ subu $v0, $v0, $a0
/* 22C40 80047840 3C03800A */ lui $v1, %hi(D_8009ED54)
/* 22C44 80047844 8C63ED54 */ lw $v1, %lo(D_8009ED54)($v1)
/* 22C48 80047848 00021100 */ sll $v0, $v0, 4
/* 22C4C 8004784C 00622021 */ addu $a0, $v1, $v0
/* 22C50 80047850 80820068 */ lb $v0, 0x68($a0)
/* 22C54 80047854 1040000C */ beqz $v0, .L80047888
/* 22C58 80047858 90830068 */ lbu $v1, 0x68($a0)
/* 22C5C 8004785C 80820069 */ lb $v0, 0x69($a0)
/* 22C60 80047860 14400009 */ bnez $v0, .L80047888
/* 22C64 80047864 24020001 */ addiu $v0, $zero, 1
/* 22C68 80047868 A0830069 */ sb $v1, 0x69($a0)
/* 22C6C 8004786C 8C830070 */ lw $v1, 0x70($a0)
/* 22C70 80047870 A082006B */ sb $v0, 0x6b($a0)
/* 22C74 80047874 2402000A */ addiu $v0, $zero, 0xa
/* 22C78 80047878 A0800068 */ sb $zero, 0x68($a0)
/* 22C7C 8004787C A080006A */ sb $zero, 0x6a($a0)
/* 22C80 80047880 A082006D */ sb $v0, 0x6d($a0)
/* 22C84 80047884 AC830074 */ sw $v1, 0x74($a0)
.L80047888:
/* 22C88 80047888 03E00008 */ jr $ra
/* 22C8C 8004788C 00000000 */ nop