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

22 lines
977 B
ArmAsm

.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80045948
/* 20D48 80045948 0000202D */ daddu $a0, $zero, $zero
/* 20D4C 8004594C 24050001 */ addiu $a1, $zero, 1
/* 20D50 80045950 3C03800A */ lui $v1, %hi(D_8009E9D0)
/* 20D54 80045954 2463E9D0 */ addiu $v1, $v1, %lo(D_8009E9D0)
.L80045958:
/* 20D58 80045958 84620010 */ lh $v0, 0x10($v1)
/* 20D5C 8004595C 14400004 */ bnez $v0, .L80045970
/* 20D60 80045960 24840001 */ addiu $a0, $a0, 1
/* 20D64 80045964 A4650010 */ sh $a1, 0x10($v1)
/* 20D68 80045968 03E00008 */ jr $ra
/* 20D6C 8004596C 0060102D */ daddu $v0, $v1, $zero
.L80045970:
/* 20D70 80045970 28820020 */ slti $v0, $a0, 0x20
/* 20D74 80045974 1440FFF8 */ bnez $v0, .L80045958
/* 20D78 80045978 2463001C */ addiu $v1, $v1, 0x1c
/* 20D7C 8004597C 03E00008 */ jr $ra
/* 20D80 80045980 0000102D */ daddu $v0, $zero, $zero