papermario/ver/us/asm/nonmatchings/EF2680/func_80241594_EF3BA4.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.1 KiB
ArmAsm

.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80241594_EF3BA4
/* EF3BA4 80241594 27BDFFE8 */ addiu $sp, $sp, -0x18
/* EF3BA8 80241598 AFB00010 */ sw $s0, 0x10($sp)
/* EF3BAC 8024159C 24100032 */ addiu $s0, $zero, 0x32
/* EF3BB0 802415A0 AFBF0014 */ sw $ra, 0x14($sp)
.L802415A4:
/* EF3BB4 802415A4 0C010ABD */ jal func_80042AF4
/* EF3BB8 802415A8 0200202D */ daddu $a0, $s0, $zero
/* EF3BBC 802415AC 8C420094 */ lw $v0, 0x94($v0)
/* EF3BC0 802415B0 54400003 */ bnel $v0, $zero, .L802415C0
/* EF3BC4 802415B4 26100001 */ addiu $s0, $s0, 1
/* EF3BC8 802415B8 08090573 */ j .L802415CC
/* EF3BCC 802415BC 0200102D */ daddu $v0, $s0, $zero
.L802415C0:
/* EF3BD0 802415C0 2A020036 */ slti $v0, $s0, 0x36
/* EF3BD4 802415C4 1440FFF7 */ bnez $v0, .L802415A4
/* EF3BD8 802415C8 2402FFFF */ addiu $v0, $zero, -1
.L802415CC:
/* EF3BDC 802415CC 8FBF0014 */ lw $ra, 0x14($sp)
/* EF3BE0 802415D0 8FB00010 */ lw $s0, 0x10($sp)
/* EF3BE4 802415D4 03E00008 */ jr $ra
/* EF3BE8 802415D8 27BD0018 */ addiu $sp, $sp, 0x18