papermario/ver/us/asm/nonmatchings/EF2680/func_80240E64_EF3474.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

32 lines
1.5 KiB
ArmAsm

.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240E64_EF3474
/* EF3474 80240E64 27BDFFE8 */ addiu $sp, $sp, -0x18
/* EF3478 80240E68 AFB00010 */ sw $s0, 0x10($sp)
/* EF347C 80240E6C 0080802D */ daddu $s0, $a0, $zero
/* EF3480 80240E70 AFBF0014 */ sw $ra, 0x14($sp)
/* EF3484 80240E74 8E020148 */ lw $v0, 0x148($s0)
/* EF3488 80240E78 0C00F92F */ jal func_8003E4BC
/* EF348C 80240E7C 84440008 */ lh $a0, 8($v0)
/* EF3490 80240E80 0040202D */ daddu $a0, $v0, $zero
/* EF3494 80240E84 8482008E */ lh $v0, 0x8e($a0)
/* EF3498 80240E88 9483008E */ lhu $v1, 0x8e($a0)
/* EF349C 80240E8C 18400005 */ blez $v0, .L80240EA4
/* EF34A0 80240E90 2462FFFF */ addiu $v0, $v1, -1
/* EF34A4 80240E94 A482008E */ sh $v0, 0x8e($a0)
/* EF34A8 80240E98 00021400 */ sll $v0, $v0, 0x10
/* EF34AC 80240E9C 1C400006 */ bgtz $v0, .L80240EB8
/* EF34B0 80240EA0 00000000 */ nop
.L80240EA4:
/* EF34B4 80240EA4 8482008C */ lh $v0, 0x8c($a0)
/* EF34B8 80240EA8 14400003 */ bnez $v0, .L80240EB8
/* EF34BC 80240EAC 2402000E */ addiu $v0, $zero, 0xe
/* EF34C0 80240EB0 A480008E */ sh $zero, 0x8e($a0)
/* EF34C4 80240EB4 AE020070 */ sw $v0, 0x70($s0)
.L80240EB8:
/* EF34C8 80240EB8 8FBF0014 */ lw $ra, 0x14($sp)
/* EF34CC 80240EBC 8FB00010 */ lw $s0, 0x10($sp)
/* EF34D0 80240EC0 03E00008 */ jr $ra
/* EF34D4 80240EC4 27BD0018 */ addiu $sp, $sp, 0x18