papermario/ver/jp/asm/nonmatchings/33E80/func_80058CB8.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

24 lines
1.0 KiB
ArmAsm

.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80058CB8
/* 340B8 80058CB8 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 340BC 80058CBC 00071400 */ sll $v0, $a3, 0x10
/* 340C0 80058CC0 AFBF0010 */ sw $ra, 0x10($sp)
/* 340C4 80058CC4 A4850006 */ sh $a1, 6($a0)
/* 340C8 80058CC8 10400008 */ beqz $v0, .L80058CEC
/* 340CC 80058CCC A4860008 */ sh $a2, 8($a0)
/* 340D0 80058CD0 8C820010 */ lw $v0, 0x10($a0)
/* 340D4 80058CD4 AC82000C */ sw $v0, 0xc($a0)
/* 340D8 80058CD8 A4470000 */ sh $a3, ($v0)
/* 340DC 80058CDC 0C0162A0 */ jal func_80058A80
/* 340E0 80058CE0 8C84000C */ lw $a0, 0xc($a0)
/* 340E4 80058CE4 0801633C */ j .L80058CF0
/* 340E8 80058CE8 00000000 */ nop
.L80058CEC:
/* 340EC 80058CEC AC80000C */ sw $zero, 0xc($a0)
.L80058CF0:
/* 340F0 80058CF0 8FBF0010 */ lw $ra, 0x10($sp)
/* 340F4 80058CF4 03E00008 */ jr $ra
/* 340F8 80058CF8 27BD0018 */ addiu $sp, $sp, 0x18