papermario/ver/jp/asm/nonmatchings/35F50/func_8005B6A4.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
775 B
ArmAsm

.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8005B6A4
/* 36AA4 8005B6A4 8CC60000 */ lw $a2, ($a2)
/* 36AA8 8005B6A8 18C00008 */ blez $a2, .L8005B6CC
/* 36AAC 8005B6AC 0000182D */ daddu $v1, $zero, $zero
.L8005B6B0:
/* 36AB0 8005B6B0 8C820000 */ lw $v0, ($a0)
/* 36AB4 8005B6B4 10450005 */ beq $v0, $a1, .L8005B6CC
/* 36AB8 8005B6B8 00000000 */ nop
/* 36ABC 8005B6BC 24630001 */ addiu $v1, $v1, 1
/* 36AC0 8005B6C0 0066102A */ slt $v0, $v1, $a2
/* 36AC4 8005B6C4 1440FFFA */ bnez $v0, .L8005B6B0
/* 36AC8 8005B6C8 24840004 */ addiu $a0, $a0, 4
.L8005B6CC:
/* 36ACC 8005B6CC 03E00008 */ jr $ra
/* 36AD0 8005B6D0 0060102D */ daddu $v0, $v1, $zero