mirror of
https://github.com/pmret/papermario.git
synced 2024-11-14 15:03:25 +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>
33 lines
1.6 KiB
ArmAsm
33 lines
1.6 KiB
ArmAsm
.set noat # allow manual use of $at
|
|
.set noreorder # don't insert nops after branches
|
|
|
|
glabel update_item_entity_static
|
|
/* CBD58 80135658 27BDFFE8 */ addiu $sp, $sp, -0x18
|
|
/* CBD5C 8013565C AFB00010 */ sw $s0, 0x10($sp)
|
|
/* CBD60 80135660 0080802D */ daddu $s0, $a0, $zero
|
|
/* CBD64 80135664 AFBF0014 */ sw $ra, 0x14($sp)
|
|
/* CBD68 80135668 8202001A */ lb $v0, 0x1a($s0)
|
|
/* CBD6C 8013566C 14400011 */ bnez $v0, .L801356B4
|
|
/* CBD70 80135670 00000000 */ nop
|
|
/* CBD74 80135674 0C04CEC3 */ jal test_item_player_collision
|
|
/* CBD78 80135678 00000000 */ nop
|
|
/* CBD7C 8013567C 1040000D */ beqz $v0, .L801356B4
|
|
/* CBD80 80135680 24020001 */ addiu $v0, $zero, 1
|
|
/* CBD84 80135684 3C018015 */ lui $at, %hi(D_801565A4)
|
|
/* CBD88 80135688 A42265A4 */ sh $v0, %lo(D_801565A4)($at)
|
|
/* CBD8C 8013568C 2402001C */ addiu $v0, $zero, 0x1c
|
|
/* CBD90 80135690 3C03800A */ lui $v1, %hi(gOverrideFlags)
|
|
/* CBD94 80135694 2463A650 */ addiu $v1, $v1, %lo(gOverrideFlags)
|
|
/* CBD98 80135698 A202001B */ sb $v0, 0x1b($s0)
|
|
/* CBD9C 8013569C A200001A */ sb $zero, 0x1a($s0)
|
|
/* CBDA0 801356A0 8C620000 */ lw $v0, ($v1)
|
|
/* CBDA4 801356A4 3C018015 */ lui $at, %hi(D_801565A8)
|
|
/* CBDA8 801356A8 A42065A8 */ sh $zero, %lo(D_801565A8)($at)
|
|
/* CBDAC 801356AC 34420040 */ ori $v0, $v0, 0x40
|
|
/* CBDB0 801356B0 AC620000 */ sw $v0, ($v1)
|
|
.L801356B4:
|
|
/* CBDB4 801356B4 8FBF0014 */ lw $ra, 0x14($sp)
|
|
/* CBDB8 801356B8 8FB00010 */ lw $s0, 0x10($sp)
|
|
/* CBDBC 801356BC 03E00008 */ jr $ra
|
|
/* CBDC0 801356C0 27BD0018 */ addiu $sp, $sp, 0x18
|