papermario/ver/jp/asm/nonmatchings/2DEE0/func_80054C24.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

27 lines
1.1 KiB
ArmAsm

.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80054C24
/* 30024 80054C24 04C10002 */ bgez $a2, .L80054C30
/* 30028 80054C28 00C0102D */ daddu $v0, $a2, $zero
/* 3002C 80054C2C 24C20003 */ addiu $v0, $a2, 3
.L80054C30:
/* 30030 80054C30 00023083 */ sra $a2, $v0, 2
/* 30034 80054C34 18C0000B */ blez $a2, .L80054C64
/* 30038 80054C38 00851025 */ or $v0, $a0, $a1
/* 3003C 80054C3C 30420003 */ andi $v0, $v0, 3
/* 30040 80054C40 14400008 */ bnez $v0, .L80054C64
/* 30044 80054C44 24C6FFFF */ addiu $a2, $a2, -1
.L80054C48:
/* 30048 80054C48 8C820000 */ lw $v0, ($a0)
/* 3004C 80054C4C 24840004 */ addiu $a0, $a0, 4
/* 30050 80054C50 00C0182D */ daddu $v1, $a2, $zero
/* 30054 80054C54 24C6FFFF */ addiu $a2, $a2, -1
/* 30058 80054C58 ACA20000 */ sw $v0, ($a1)
/* 3005C 80054C5C 1460FFFA */ bnez $v1, .L80054C48
/* 30060 80054C60 24A50004 */ addiu $a1, $a1, 4
.L80054C64:
/* 30064 80054C64 03E00008 */ jr $ra
/* 30068 80054C68 00000000 */ nop
/* 3006C 80054C6C 00000000 */ nop