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

19 lines
904 B
ArmAsm

.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_800548FC
/* 2FCFC 800548FC 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 2FD00 80054900 00051080 */ sll $v0, $a1, 2
/* 2FD04 80054904 3C03800A */ lui $v1, %hi(D_8009A5A0)
/* 2FD08 80054908 8C63A5A0 */ lw $v1, %lo(D_8009A5A0)($v1)
/* 2FD0C 8005490C 00A0302D */ daddu $a2, $a1, $zero
/* 2FD10 80054910 AFBF0010 */ sw $ra, 0x10($sp)
/* 2FD14 80054914 00621821 */ addu $v1, $v1, $v0
/* 2FD18 80054918 8C651310 */ lw $a1, 0x1310($v1)
/* 2FD1C 8005491C 0C01511E */ jal func_80054478
/* 2FD20 80054920 24070001 */ addiu $a3, $zero, 1
/* 2FD24 80054924 8FBF0010 */ lw $ra, 0x10($sp)
/* 2FD28 80054928 0000102D */ daddu $v0, $zero, $zero
/* 2FD2C 8005492C 03E00008 */ jr $ra
/* 2FD30 80054930 27BD0018 */ addiu $sp, $sp, 0x18