pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-08 20:12:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Match CreatePartShadow & RemovePartShadow (#511)

Browse Source
This commit is contained in:
Technoman 2021-10-31 09:57:57 -04:00 committed by GitHub
parent 14d3ac1aaa
commit a9b8afe9ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/197F40.c
View File

@ -2346,9 +2346,31 @@ ApiStatus SetPartAlpha(Evt* script, s32 isInitialCall) {
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(s32, "197F40", CreatePartShadow); ApiStatus CreatePartShadow(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex = evt_get_variable(script, *args++);
INCLUDE_ASM(s32, "197F40", RemovePartShadow); if (actorID == ACTOR_SELF) {
actorID = script->owner1.actorID;
}
create_part_shadow(actorID, partIndex);
return ApiStatus_DONE2;
}
ApiStatus RemovePartShadow(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32 actorID = evt_get_variable(script, *args++);
s32 partIndex = evt_get_variable(script, *args++);
if (actorID == ACTOR_SELF) {
actorID = script->owner1.actorID;
}
remove_part_shadow(actorID, partIndex);
return ApiStatus_DONE2;
}
ApiStatus func_8026F60C(Evt* script, s32 isInitialCall) { ApiStatus func_8026F60C(Evt* script, s32 isInitialCall) {
gBattleStatus.unk_8D = evt_get_variable(script, *script->ptrReadPos); gBattleStatus.unk_8D = evt_get_variable(script, *script->ptrReadPos);

33
ver/us/asm/nonmatchings/197F40/CreatePartShadow.s
View File

@ -1,33 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel CreatePartShadow
/* 19DE0C 8026F52C 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 19DE10 8026F530 AFB20018 */ sw $s2, 0x18($sp)
/* 19DE14 8026F534 0080902D */ daddu $s2, $a0, $zero
/* 19DE18 8026F538 AFBF001C */ sw $ra, 0x1c($sp)
/* 19DE1C 8026F53C AFB10014 */ sw $s1, 0x14($sp)
/* 19DE20 8026F540 AFB00010 */ sw $s0, 0x10($sp)
/* 19DE24 8026F544 8E50000C */ lw $s0, 0xc($s2)
/* 19DE28 8026F548 8E050000 */ lw $a1, ($s0)
/* 19DE2C 8026F54C 0C0B1EAF */ jal evt_get_variable
/* 19DE30 8026F550 26100004 */ addiu $s0, $s0, 4
/* 19DE34 8026F554 0040882D */ daddu $s1, $v0, $zero
/* 19DE38 8026F558 8E050000 */ lw $a1, ($s0)
/* 19DE3C 8026F55C 0C0B1EAF */ jal evt_get_variable
/* 19DE40 8026F560 0240202D */ daddu $a0, $s2, $zero
/* 19DE44 8026F564 0040282D */ daddu $a1, $v0, $zero
/* 19DE48 8026F568 2402FF81 */ addiu $v0, $zero, -0x7f
/* 19DE4C 8026F56C 16220002 */ bne $s1, $v0, .L8026F578
/* 19DE50 8026F570 00000000 */ nop
/* 19DE54 8026F574 8E510148 */ lw $s1, 0x148($s2)
.L8026F578:
/* 19DE58 8026F578 0C099CC7 */ jal create_part_shadow
/* 19DE5C 8026F57C 0220202D */ daddu $a0, $s1, $zero
/* 19DE60 8026F580 8FBF001C */ lw $ra, 0x1c($sp)
/* 19DE64 8026F584 8FB20018 */ lw $s2, 0x18($sp)
/* 19DE68 8026F588 8FB10014 */ lw $s1, 0x14($sp)
/* 19DE6C 8026F58C 8FB00010 */ lw $s0, 0x10($sp)
/* 19DE70 8026F590 24020002 */ addiu $v0, $zero, 2
/* 19DE74 8026F594 03E00008 */ jr $ra
/* 19DE78 8026F598 27BD0020 */ addiu $sp, $sp, 0x20

33
ver/us/asm/nonmatchings/197F40/RemovePartShadow.s
View File

@ -1,33 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel RemovePartShadow
/* 19DE7C 8026F59C 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 19DE80 8026F5A0 AFB20018 */ sw $s2, 0x18($sp)
/* 19DE84 8026F5A4 0080902D */ daddu $s2, $a0, $zero
/* 19DE88 8026F5A8 AFBF001C */ sw $ra, 0x1c($sp)
/* 19DE8C 8026F5AC AFB10014 */ sw $s1, 0x14($sp)
/* 19DE90 8026F5B0 AFB00010 */ sw $s0, 0x10($sp)
/* 19DE94 8026F5B4 8E50000C */ lw $s0, 0xc($s2)
/* 19DE98 8026F5B8 8E050000 */ lw $a1, ($s0)
/* 19DE9C 8026F5BC 0C0B1EAF */ jal evt_get_variable
/* 19DEA0 8026F5C0 26100004 */ addiu $s0, $s0, 4
/* 19DEA4 8026F5C4 0040882D */ daddu $s1, $v0, $zero
/* 19DEA8 8026F5C8 8E050000 */ lw $a1, ($s0)
/* 19DEAC 8026F5CC 0C0B1EAF */ jal evt_get_variable
/* 19DEB0 8026F5D0 0240202D */ daddu $a0, $s2, $zero
/* 19DEB4 8026F5D4 0040282D */ daddu $a1, $v0, $zero
/* 19DEB8 8026F5D8 2402FF81 */ addiu $v0, $zero, -0x7f
/* 19DEBC 8026F5DC 16220002 */ bne $s1, $v0, .L8026F5E8
/* 19DEC0 8026F5E0 00000000 */ nop
/* 19DEC4 8026F5E4 8E510148 */ lw $s1, 0x148($s2)
.L8026F5E8:
/* 19DEC8 8026F5E8 0C099CE8 */ jal remove_part_shadow
/* 19DECC 8026F5EC 0220202D */ daddu $a0, $s1, $zero
/* 19DED0 8026F5F0 8FBF001C */ lw $ra, 0x1c($sp)
/* 19DED4 8026F5F4 8FB20018 */ lw $s2, 0x18($sp)
/* 19DED8 8026F5F8 8FB10014 */ lw $s1, 0x14($sp)
/* 19DEDC 8026F5FC 8FB00010 */ lw $s0, 0x10($sp)
/* 19DEE0 8026F600 24020002 */ addiu $v0, $zero, 2
/* 19DEE4 8026F604 03E00008 */ jr $ra
/* 19DEE8 8026F608 27BD0020 */ addiu $sp, $sp, 0x20