mirror of
https://github.com/pmret/papermario.git
synced 2024-11-15 23:42:42 +01:00
3315d6010f
* 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>
55 lines
2.6 KiB
ArmAsm
55 lines
2.6 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel osCheckId
|
|
/* 451D4 80069DD4 27BDFFC8 */ addiu $sp, $sp, -0x38
|
|
/* 451D8 80069DD8 AFB00030 */ sw $s0, 0x30($sp)
|
|
/* 451DC 80069DDC 00808021 */ addu $s0, $a0, $zero
|
|
/* 451E0 80069DE0 AFBF0034 */ sw $ra, 0x34($sp)
|
|
/* 451E4 80069DE4 92020065 */ lbu $v0, 0x65($s0)
|
|
/* 451E8 80069DE8 1040000C */ beqz $v0, .L80069E1C
|
|
/* 451EC 80069DEC 00000000 */ nop
|
|
/* 451F0 80069DF0 0C01A5B4 */ jal osPfsSelectBank
|
|
/* 451F4 80069DF4 00002821 */ addu $a1, $zero, $zero
|
|
/* 451F8 80069DF8 00401821 */ addu $v1, $v0, $zero
|
|
/* 451FC 80069DFC 24020002 */ addiu $v0, $zero, 2
|
|
/* 45200 80069E00 14620004 */ bne $v1, $v0, .L80069E14
|
|
/* 45204 80069E04 02002021 */ addu $a0, $s0, $zero
|
|
/* 45208 80069E08 0C01A5B4 */ jal osPfsSelectBank
|
|
/* 4520C 80069E0C 00002821 */ addu $a1, $zero, $zero
|
|
/* 45210 80069E10 00401821 */ addu $v1, $v0, $zero
|
|
.L80069E14:
|
|
/* 45214 80069E14 14600019 */ bnez $v1, .L80069E7C
|
|
/* 45218 80069E18 00601021 */ addu $v0, $v1, $zero
|
|
.L80069E1C:
|
|
/* 4521C 80069E1C 8E040004 */ lw $a0, 4($s0)
|
|
/* 45220 80069E20 8E050008 */ lw $a1, 8($s0)
|
|
/* 45224 80069E24 24060001 */ addiu $a2, $zero, 1
|
|
/* 45228 80069E28 0C01A874 */ jal osContRamRead
|
|
/* 4522C 80069E2C 27A70010 */ addiu $a3, $sp, 0x10
|
|
/* 45230 80069E30 00401821 */ addu $v1, $v0, $zero
|
|
/* 45234 80069E34 1060000B */ beqz $v1, .L80069E64
|
|
/* 45238 80069E38 24020002 */ addiu $v0, $zero, 2
|
|
/* 4523C 80069E3C 1462000F */ bne $v1, $v0, .L80069E7C
|
|
/* 45240 80069E40 00601021 */ addu $v0, $v1, $zero
|
|
/* 45244 80069E44 8E040004 */ lw $a0, 4($s0)
|
|
/* 45248 80069E48 8E050008 */ lw $a1, 8($s0)
|
|
/* 4524C 80069E4C 24060001 */ addiu $a2, $zero, 1
|
|
/* 45250 80069E50 0C01A874 */ jal osContRamRead
|
|
/* 45254 80069E54 27A70010 */ addiu $a3, $sp, 0x10
|
|
/* 45258 80069E58 00401821 */ addu $v1, $v0, $zero
|
|
/* 4525C 80069E5C 14600007 */ bnez $v1, .L80069E7C
|
|
/* 45260 80069E60 00000000 */ nop
|
|
.L80069E64:
|
|
/* 45264 80069E64 2604000C */ addiu $a0, $s0, 0xc
|
|
/* 45268 80069E68 27A50010 */ addiu $a1, $sp, 0x10
|
|
/* 4526C 80069E6C 0C01AE1C */ jal bcmp
|
|
/* 45270 80069E70 24060020 */ addiu $a2, $zero, 0x20
|
|
/* 45274 80069E74 0002102B */ sltu $v0, $zero, $v0
|
|
/* 45278 80069E78 00021040 */ sll $v0, $v0, 1
|
|
.L80069E7C:
|
|
/* 4527C 80069E7C 8FBF0034 */ lw $ra, 0x34($sp)
|
|
/* 45280 80069E80 8FB00030 */ lw $s0, 0x30($sp)
|
|
/* 45284 80069E84 03E00008 */ jr $ra
|
|
/* 45288 80069E88 27BD0038 */ addiu $sp, $sp, 0x38
|