papermario/ver/jp/asm/nonmatchings/8490/func_8002E3E4.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

38 lines
1.7 KiB
ArmAsm

.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8002E3E4
/* 97E4 8002E3E4 00A0402D */ daddu $t0, $a1, $zero
/* 97E8 8002E3E8 3C05800B */ lui $a1, %hi(D_800B1D60)
/* 97EC 8002E3EC 24A51D60 */ addiu $a1, $a1, %lo(D_800B1D60)
/* 97F0 8002E3F0 00041080 */ sll $v0, $a0, 2
/* 97F4 8002E3F4 00441021 */ addu $v0, $v0, $a0
/* 97F8 8002E3F8 00021080 */ sll $v0, $v0, 2
/* 97FC 8002E3FC 00441023 */ subu $v0, $v0, $a0
/* 9800 8002E400 000218C0 */ sll $v1, $v0, 3
/* 9804 8002E404 00431021 */ addu $v0, $v0, $v1
/* 9808 8002E408 000210C0 */ sll $v0, $v0, 3
/* 980C 8002E40C 00451021 */ addu $v0, $v0, $a1
/* 9810 8002E410 8443000E */ lh $v1, 0xe($v0)
/* 9814 8002E414 84450010 */ lh $a1, 0x10($v0)
/* 9818 8002E418 8444000A */ lh $a0, 0xa($v0)
/* 981C 8002E41C 8442000C */ lh $v0, 0xc($v0)
/* 9820 8002E420 00642021 */ addu $a0, $v1, $a0
/* 9824 8002E424 0103182A */ slt $v1, $t0, $v1
/* 9828 8002E428 14600004 */ bnez $v1, .L8002E43C
/* 982C 8002E42C 00A23821 */ addu $a3, $a1, $v0
/* 9830 8002E430 0088102A */ slt $v0, $a0, $t0
/* 9834 8002E434 10400003 */ beqz $v0, .L8002E444
/* 9838 8002E438 00C5102A */ slt $v0, $a2, $a1
.L8002E43C:
/* 983C 8002E43C 03E00008 */ jr $ra
/* 9840 8002E440 24020001 */ addiu $v0, $zero, 1
.L8002E444:
/* 9844 8002E444 10400003 */ beqz $v0, .L8002E454
/* 9848 8002E448 00E6102A */ slt $v0, $a3, $a2
/* 984C 8002E44C 03E00008 */ jr $ra
/* 9850 8002E450 24020001 */ addiu $v0, $zero, 1
.L8002E454:
/* 9854 8002E454 03E00008 */ jr $ra
/* 9858 8002E458 00000000 */ nop