papermario/ver/jp/asm/nonmatchings/31300/func_80057524.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

99 lines
5.0 KiB
ArmAsm

.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80057524
/* 32924 80057524 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 32928 80057528 AFB20018 */ sw $s2, 0x18($sp)
/* 3292C 8005752C 00A0902D */ daddu $s2, $a1, $zero
/* 32930 80057530 308400FF */ andi $a0, $a0, 0xff
/* 32934 80057534 00041140 */ sll $v0, $a0, 5
/* 32938 80057538 3C038008 */ lui $v1, %hi(D_80078E24)
/* 3293C 8005753C 8C638E24 */ lw $v1, %lo(D_80078E24)($v1)
/* 32940 80057540 00441023 */ subu $v0, $v0, $a0
/* 32944 80057544 AFBF001C */ sw $ra, 0x1c($sp)
/* 32948 80057548 AFB10014 */ sw $s1, 0x14($sp)
/* 3294C 8005754C AFB00010 */ sw $s0, 0x10($sp)
/* 32950 80057550 8C63001C */ lw $v1, 0x1c($v1)
/* 32954 80057554 00021080 */ sll $v0, $v0, 2
/* 32958 80057558 00628021 */ addu $s0, $v1, $v0
/* 3295C 8005755C 8E050064 */ lw $a1, 0x64($s0)
/* 32960 80057560 8E030068 */ lw $v1, 0x68($s0)
/* 32964 80057564 00A3102A */ slt $v0, $a1, $v1
/* 32968 80057568 14400029 */ bnez $v0, .L80057610
/* 3296C 8005756C 26110048 */ addiu $s1, $s0, 0x48
/* 32970 80057570 3C028008 */ lui $v0, %hi(D_80078151)
/* 32974 80057574 24428151 */ addiu $v0, $v0, %lo(D_80078151)
/* 32978 80057578 90420000 */ lbu $v0, ($v0)
/* 3297C 8005757C 1440000E */ bnez $v0, .L800575B8
/* 32980 80057580 AE030064 */ sw $v1, 0x64($s0)
/* 32984 80057584 3C048008 */ lui $a0, %hi(D_80078E30)
/* 32988 80057588 24848E30 */ addiu $a0, $a0, %lo(D_80078E30)
/* 3298C 8005758C 8603004E */ lh $v1, 0x4e($s0)
/* 32990 80057590 84820080 */ lh $v0, 0x80($a0)
/* 32994 80057594 00620018 */ mult $v1, $v0
/* 32998 80057598 00004012 */ mflo $t0
/* 3299C 8005759C 000813C3 */ sra $v0, $t0, 0xf
/* 329A0 800575A0 A6020050 */ sh $v0, 0x50($s0)
/* 329A4 800575A4 84820080 */ lh $v0, 0x80($a0)
/* 329A8 800575A8 00620018 */ mult $v1, $v0
/* 329AC 800575AC 00004012 */ mflo $t0
/* 329B0 800575B0 08015D8E */ j .L80057638
/* 329B4 800575B4 000813C3 */ sra $v0, $t0, 0xf
.L800575B8:
/* 329B8 800575B8 8602004C */ lh $v0, 0x4c($s0)
/* 329BC 800575BC 8603004E */ lh $v1, 0x4e($s0)
/* 329C0 800575C0 00021040 */ sll $v0, $v0, 1
/* 329C4 800575C4 3C018008 */ lui $at, %hi(D_80078E30)
/* 329C8 800575C8 00220821 */ addu $at, $at, $v0
/* 329CC 800575CC 84228E30 */ lh $v0, %lo(D_80078E30)($at)
/* 329D0 800575D0 00620018 */ mult $v1, $v0
/* 329D4 800575D4 8603004C */ lh $v1, 0x4c($s0)
/* 329D8 800575D8 00004012 */ mflo $t0
/* 329DC 800575DC 000813C3 */ sra $v0, $t0, 0xf
/* 329E0 800575E0 A6020050 */ sh $v0, 0x50($s0)
/* 329E4 800575E4 2402007F */ addiu $v0, $zero, 0x7f
/* 329E8 800575E8 00431023 */ subu $v0, $v0, $v1
/* 329EC 800575EC 00021040 */ sll $v0, $v0, 1
/* 329F0 800575F0 8603004E */ lh $v1, 0x4e($s0)
/* 329F4 800575F4 3C018008 */ lui $at, %hi(D_80078E30)
/* 329F8 800575F8 00220821 */ addu $at, $at, $v0
/* 329FC 800575FC 84228E30 */ lh $v0, %lo(D_80078E30)($at)
/* 32A00 80057600 00620018 */ mult $v1, $v0
/* 32A04 80057604 00004012 */ mflo $t0
/* 32A08 80057608 08015D8E */ j .L80057638
/* 32A0C 8005760C 000813C3 */ sra $v0, $t0, 0xf
.L80057610:
/* 32A10 80057610 86040050 */ lh $a0, 0x50($s0)
/* 32A14 80057614 8606005A */ lh $a2, 0x5a($s0)
/* 32A18 80057618 0C015F2D */ jal func_80057CB4
/* 32A1C 8005761C 96070058 */ lhu $a3, 0x58($s0)
/* 32A20 80057620 86040052 */ lh $a0, 0x52($s0)
/* 32A24 80057624 8E050064 */ lw $a1, 0x64($s0)
/* 32A28 80057628 86060060 */ lh $a2, 0x60($s0)
/* 32A2C 8005762C 9607005E */ lhu $a3, 0x5e($s0)
/* 32A30 80057630 0C015F2D */ jal func_80057CB4
/* 32A34 80057634 A6020050 */ sh $v0, 0x50($s0)
.L80057638:
/* 32A38 80057638 A6020052 */ sh $v0, 0x52($s0)
/* 32A3C 8005763C 86220008 */ lh $v0, 8($s1)
/* 32A40 80057640 14400002 */ bnez $v0, .L8005764C
/* 32A44 80057644 24020001 */ addiu $v0, $zero, 1
/* 32A48 80057648 A6220008 */ sh $v0, 8($s1)
.L8005764C:
/* 32A4C 8005764C 8622000A */ lh $v0, 0xa($s1)
/* 32A50 80057650 14400004 */ bnez $v0, .L80057664
/* 32A54 80057654 324200FF */ andi $v0, $s2, 0xff
/* 32A58 80057658 24020001 */ addiu $v0, $zero, 1
/* 32A5C 8005765C A622000A */ sh $v0, 0xa($s1)
/* 32A60 80057660 324200FF */ andi $v0, $s2, 0xff
.L80057664:
/* 32A64 80057664 A6220004 */ sh $v0, 4($s1)
/* 32A68 80057668 24020001 */ addiu $v0, $zero, 1
/* 32A6C 8005766C AE220024 */ sw $v0, 0x24($s1)
/* 32A70 80057670 8FBF001C */ lw $ra, 0x1c($sp)
/* 32A74 80057674 8FB20018 */ lw $s2, 0x18($sp)
/* 32A78 80057678 8FB10014 */ lw $s1, 0x14($sp)
/* 32A7C 8005767C 8FB00010 */ lw $s0, 0x10($sp)
/* 32A80 80057680 03E00008 */ jr $ra
/* 32A84 80057684 27BD0020 */ addiu $sp, $sp, 0x20