papermario/ver/jp/asm/nonmatchings/3C820/func_80061420.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

26 lines
1.3 KiB
ArmAsm

.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80061420
/* 3C820 80061420 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 3C824 80061424 24020001 */ addiu $v0, $zero, 1
/* 3C828 80061428 AFB00010 */ sw $s0, 0x10($sp)
/* 3C82C 8006142C 3C10800B */ lui $s0, %hi(D_800B4360)
/* 3C830 80061430 26104360 */ addiu $s0, $s0, %lo(D_800B4360)
/* 3C834 80061434 02002021 */ addu $a0, $s0, $zero
/* 3C838 80061438 3C05800B */ lui $a1, %hi(D_800AF890)
/* 3C83C 8006143C 24A5F890 */ addiu $a1, $a1, %lo(D_800AF890)
/* 3C840 80061440 AFBF0014 */ sw $ra, 0x14($sp)
/* 3C844 80061444 3C018009 */ lui $at, %hi(D_80093D70)
/* 3C848 80061448 AC223D70 */ sw $v0, %lo(D_80093D70)($at)
/* 3C84C 8006144C 0C019554 */ jal func_80065550
/* 3C850 80061450 24060001 */ addiu $a2, $zero, 1
/* 3C854 80061454 02002021 */ addu $a0, $s0, $zero
/* 3C858 80061458 00002821 */ addu $a1, $zero, $zero
/* 3C85C 8006145C 0C0195FC */ jal func_800657F0
/* 3C860 80061460 00003021 */ addu $a2, $zero, $zero
/* 3C864 80061464 8FBF0014 */ lw $ra, 0x14($sp)
/* 3C868 80061468 8FB00010 */ lw $s0, 0x10($sp)
/* 3C86C 8006146C 03E00008 */ jr $ra
/* 3C870 80061470 27BD0018 */ addiu $sp, $sp, 0x18