papermario/ver/jp/asm/nonmatchings/30100/func_80055584.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.1 KiB
ArmAsm

.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80055584
/* 30984 80055584 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 30988 80055588 AFB00018 */ sw $s0, 0x18($sp)
/* 3098C 8005558C 0080802D */ daddu $s0, $a0, $zero
/* 30990 80055590 00A0202D */ daddu $a0, $a1, $zero
/* 30994 80055594 27A50010 */ addiu $a1, $sp, 0x10
/* 30998 80055598 AFBF001C */ sw $ra, 0x1c($sp)
/* 3099C 8005559C 0C014E42 */ jal func_80053908
/* 309A0 800555A0 27A60014 */ addiu $a2, $sp, 0x14
/* 309A4 800555A4 8FA50010 */ lw $a1, 0x10($sp)
/* 309A8 800555A8 10A00004 */ beqz $a1, .L800555BC
/* 309AC 800555AC 24020003 */ addiu $v0, $zero, 3
/* 309B0 800555B0 8FA60014 */ lw $a2, 0x14($sp)
/* 309B4 800555B4 0C014E6A */ jal func_800539A8
/* 309B8 800555B8 0200202D */ daddu $a0, $s0, $zero
.L800555BC:
/* 309BC 800555BC 8FBF001C */ lw $ra, 0x1c($sp)
/* 309C0 800555C0 8FB00018 */ lw $s0, 0x18($sp)
/* 309C4 800555C4 03E00008 */ jr $ra
/* 309C8 800555C8 27BD0020 */ addiu $sp, $sp, 0x20