papermario/ver/jp/asm/nonmatchings/264F0/func_8004D01C.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

19 lines
826 B
ArmAsm

.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8004D01C
/* 2841C 8004D01C 8CA60000 */ lw $a2, ($a1)
/* 28420 8004D020 90C20000 */ lbu $v0, ($a2)
/* 28424 8004D024 90C30001 */ lbu $v1, 1($a2)
/* 28428 8004D028 00021200 */ sll $v0, $v0, 8
/* 2842C 8004D02C 00431821 */ addu $v1, $v0, $v1
/* 28430 8004D030 50600004 */ beql $v1, $zero, .L8004D044
/* 28434 8004D034 ACA00018 */ sw $zero, 0x18($a1)
/* 28438 8004D038 8C820008 */ lw $v0, 8($a0)
/* 2843C 8004D03C 00621021 */ addu $v0, $v1, $v0
/* 28440 8004D040 ACA20018 */ sw $v0, 0x18($a1)
.L8004D044:
/* 28444 8004D044 24C20002 */ addiu $v0, $a2, 2
/* 28448 8004D048 03E00008 */ jr $ra
/* 2844C 8004D04C ACA20000 */ sw $v0, ($a1)