papermario/ver/jp/asm/nonmatchings/2BC40/func_80050914.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

21 lines
950 B
ArmAsm

.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80050914
/* 2BD14 80050914 3C03800A */ lui $v1, %hi(D_8009A608)
/* 2BD18 80050918 8C63A608 */ lw $v1, %lo(D_8009A608)($v1)
/* 2BD1C 8005091C 00041100 */ sll $v0, $a0, 4
/* 2BD20 80050920 00441023 */ subu $v0, $v0, $a0
/* 2BD24 80050924 000210C0 */ sll $v0, $v0, 3
/* 2BD28 80050928 00441021 */ addu $v0, $v0, $a0
/* 2BD2C 8005092C 00021080 */ sll $v0, $v0, 2
/* 2BD30 80050930 24420024 */ addiu $v0, $v0, 0x24
/* 2BD34 80050934 14A00003 */ bnez $a1, .L80050944
/* 2BD38 80050938 00621821 */ addu $v1, $v1, $v0
/* 2BD3C 8005093C 03E00008 */ jr $ra
/* 2BD40 80050940 A0600025 */ sb $zero, 0x25($v1)
.L80050944:
/* 2BD44 80050944 24020002 */ addiu $v0, $zero, 2
/* 2BD48 80050948 03E00008 */ jr $ra
/* 2BD4C 8005094C A0620025 */ sb $v0, 0x25($v1)