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

18 lines
771 B
ArmAsm

.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8004CBBC
/* 27FBC 8004CBBC 8CA20000 */ lw $v0, ($a1)
/* 27FC0 8004CBC0 90A3009A */ lbu $v1, 0x9a($a1)
/* 27FC4 8004CBC4 90460000 */ lbu $a2, ($v0)
/* 27FC8 8004CBC8 24420001 */ addiu $v0, $v0, 1
/* 27FCC 8004CBCC 30630020 */ andi $v1, $v1, 0x20
/* 27FD0 8004CBD0 10600002 */ beqz $v1, .L8004CBDC
/* 27FD4 8004CBD4 ACA20000 */ sw $v0, ($a1)
/* 27FD8 8004CBD8 9086008D */ lbu $a2, 0x8d($a0)
.L8004CBDC:
/* 27FDC 8004CBDC 24020001 */ addiu $v0, $zero, 1
/* 27FE0 8004CBE0 A0A6009C */ sb $a2, 0x9c($a1)
/* 27FE4 8004CBE4 03E00008 */ jr $ra
/* 27FE8 8004CBE8 A0A20057 */ sb $v0, 0x57($a1)