papermario/ver/jp/asm/nonmatchings/20B80/func_800475D4.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

36 lines
1.8 KiB
ArmAsm

.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_800475D4
/* 229D4 800475D4 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 229D8 800475D8 0080302D */ daddu $a2, $a0, $zero
/* 229DC 800475DC AFB10014 */ sw $s1, 0x14($sp)
/* 229E0 800475E0 00A0882D */ daddu $s1, $a1, $zero
/* 229E4 800475E4 00061040 */ sll $v0, $a2, 1
/* 229E8 800475E8 00461021 */ addu $v0, $v0, $a2
/* 229EC 800475EC 00021080 */ sll $v0, $v0, 2
/* 229F0 800475F0 00461023 */ subu $v0, $v0, $a2
/* 229F4 800475F4 3C03800A */ lui $v1, %hi(D_8009ED54)
/* 229F8 800475F8 8C63ED54 */ lw $v1, %lo(D_8009ED54)($v1)
/* 229FC 800475FC 00021100 */ sll $v0, $v0, 4
/* 22A00 80047600 AFBF0018 */ sw $ra, 0x18($sp)
/* 22A04 80047604 AFB00010 */ sw $s0, 0x10($sp)
/* 22A08 80047608 00628021 */ addu $s0, $v1, $v0
/* 22A0C 8004760C 2403FFF7 */ addiu $v1, $zero, -9
/* 22A10 80047610 8E020000 */ lw $v0, ($s0)
/* 22A14 80047614 82040048 */ lb $a0, 0x48($s0)
/* 22A18 80047618 00431024 */ and $v0, $v0, $v1
/* 22A1C 8004761C 10910006 */ beq $a0, $s1, .L80047638
/* 22A20 80047620 AE020000 */ sw $v0, ($s0)
/* 22A24 80047624 0C011D93 */ jal func_8004764C
/* 22A28 80047628 00C0202D */ daddu $a0, $a2, $zero
/* 22A2C 8004762C 24020001 */ addiu $v0, $zero, 1
/* 22A30 80047630 A2110048 */ sb $s1, 0x48($s0)
/* 22A34 80047634 A202004A */ sb $v0, 0x4a($s0)
.L80047638:
/* 22A38 80047638 8FBF0018 */ lw $ra, 0x18($sp)
/* 22A3C 8004763C 8FB10014 */ lw $s1, 0x14($sp)
/* 22A40 80047640 8FB00010 */ lw $s0, 0x10($sp)
/* 22A44 80047644 03E00008 */ jr $ra
/* 22A48 80047648 27BD0020 */ addiu $sp, $sp, 0x20