papermario/ver/us/asm/nonmatchings/EED1E0/func_802401B4_EED2B4.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.2 KiB
ArmAsm

.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802401B4_EED2B4
/* EED2B4 802401B4 3C028011 */ lui $v0, %hi(D_80117840)
/* EED2B8 802401B8 24427840 */ addiu $v0, $v0, %lo(D_80117840)
/* EED2BC 802401BC 000420C0 */ sll $a0, $a0, 3
/* EED2C0 802401C0 00822021 */ addu $a0, $a0, $v0
/* EED2C4 802401C4 90820014 */ lbu $v0, 0x14($a0)
/* EED2C8 802401C8 10400009 */ beqz $v0, .L802401F0
/* EED2CC 802401CC 00000000 */ nop
/* EED2D0 802401D0 90820015 */ lbu $v0, 0x15($a0)
/* EED2D4 802401D4 00022600 */ sll $a0, $v0, 0x18
/* EED2D8 802401D8 00041E03 */ sra $v1, $a0, 0x18
/* EED2DC 802401DC 00051400 */ sll $v0, $a1, 0x10
/* EED2E0 802401E0 00021403 */ sra $v0, $v0, 0x10
/* EED2E4 802401E4 0043102A */ slt $v0, $v0, $v1
/* EED2E8 802401E8 10400003 */ beqz $v0, .L802401F8
/* EED2EC 802401EC 00000000 */ nop
.L802401F0:
/* EED2F0 802401F0 03E00008 */ jr $ra
/* EED2F4 802401F4 2402FFFF */ addiu $v0, $zero, -1
.L802401F8:
/* EED2F8 802401F8 03E00008 */ jr $ra
/* EED2FC 802401FC 00041603 */ sra $v0, $a0, 0x18