falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

decomp func_8003F414

This commit is contained in:
Rain 2020-12-03 09:36:01 -06:00
parent ae0b8b2826
commit 50c01dc7d1
5 changed files with 12 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
asm/nonmatchings/code_1a1f0_len_5390/func_8003F414.s
View File

@ -1,50 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8003F414
/* 1A814 8003F414 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 1A818 8003F418 AFB1001C */ sw $s1, 0x1c($sp)
/* 1A81C 8003F41C 0080882D */ daddu $s1, $a0, $zero
/* 1A820 8003F420 AFBF0024 */ sw $ra, 0x24($sp)
/* 1A824 8003F424 AFB20020 */ sw $s2, 0x20($sp)
/* 1A828 8003F428 AFB00018 */ sw $s0, 0x18($sp)
/* 1A82C 8003F42C 8E30000C */ lw $s0, 0xc($s1)
/* 1A830 8003F430 8E050000 */ lw $a1, ($s0)
/* 1A834 8003F434 0C0B1EAF */ jal get_variable
/* 1A838 8003F438 26100004 */ addiu $s0, $s0, 4
/* 1A83C 8003F43C 8E050000 */ lw $a1, ($s0)
/* 1A840 8003F440 26100004 */ addiu $s0, $s0, 4
/* 1A844 8003F444 0220202D */ daddu $a0, $s1, $zero
/* 1A848 8003F448 0C0B1EAF */ jal get_variable
/* 1A84C 8003F44C 0040902D */ daddu $s2, $v0, $zero
/* 1A850 8003F450 0220202D */ daddu $a0, $s1, $zero
/* 1A854 8003F454 8E050000 */ lw $a1, ($s0)
/* 1A858 8003F458 0C0B1EAF */ jal get_variable
/* 1A85C 8003F45C 0040802D */ daddu $s0, $v0, $zero
/* 1A860 8003F460 24040006 */ addiu $a0, $zero, 6
/* 1A864 8003F464 44921000 */ mtc1 $s2, $f2
/* 1A868 8003F468 00000000 */ nop
/* 1A86C 8003F46C 468010A0 */ cvt.s.w $f2, $f2
/* 1A870 8003F470 44051000 */ mfc1 $a1, $f2
/* 1A874 8003F474 44901000 */ mtc1 $s0, $f2
/* 1A878 8003F478 00000000 */ nop
/* 1A87C 8003F47C 468010A0 */ cvt.s.w $f2, $f2
/* 1A880 8003F480 44061000 */ mfc1 $a2, $f2
/* 1A884 8003F484 44821000 */ mtc1 $v0, $f2
/* 1A888 8003F488 00000000 */ nop
/* 1A88C 8003F48C 468010A0 */ cvt.s.w $f2, $f2
/* 1A890 8003F490 3C013F99 */ lui $at, 0x3f99
/* 1A894 8003F494 3421999A */ ori $at, $at, 0x999a
/* 1A898 8003F498 44810000 */ mtc1 $at, $f0
/* 1A89C 8003F49C 44071000 */ mfc1 $a3, $f2
/* 1A8A0 8003F4A0 2403001E */ addiu $v1, $zero, 0x1e
/* 1A8A4 8003F4A4 AFA30014 */ sw $v1, 0x14($sp)
/* 1A8A8 8003F4A8 0C01C82C */ jal func_800720B0
/* 1A8AC 8003F4AC E7A00010 */ swc1 $f0, 0x10($sp)
/* 1A8B0 8003F4B0 8FBF0024 */ lw $ra, 0x24($sp)
/* 1A8B4 8003F4B4 8FB20020 */ lw $s2, 0x20($sp)
/* 1A8B8 8003F4B8 8FB1001C */ lw $s1, 0x1c($sp)
/* 1A8BC 8003F4BC 8FB00018 */ lw $s0, 0x18($sp)
/* 1A8C0 8003F4C0 24020002 */ addiu $v0, $zero, 2
/* 1A8C4 8003F4C4 03E00008 */ jr $ra
/* 1A8C8 8003F4C8 27BD0028 */ addiu $sp, $sp, 0x28

1
include/functions.h
View File

@ -38,6 +38,7 @@ void func_80027088(s32);
void func_8006FEF0(s32, f32, f32, f32, f32);
void func_80071090(s32, f32, f32, f32, s32);
void func_80071750(s32, f32, f32, f32, f32, s32);
void func_800720B0(s32, f32, f32, f32, f32, s32);
void func_80072950(s32, f32, f32, f32, f32, s32 time);
void update_collider_transform(s16 colliderID);

12
src/code_1A5830.c
View File

@ -101,25 +101,23 @@ ApiStatus ResumeTakeTurn(ScriptInstance* script, s32 isInitialCall) {
ApiStatus BindIdle(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
ActorID actorID = get_variable(script, *args++);
s32 var1;
s32 var0;
Actor* actor;
Actor* actorIdleScript;
ScriptInstance* newScriptContext;
if (actorID == ActorID_SELF) {
actorID = script->owner1.actorID;
}
var1 = get_variable(script, *args++);
var0 = get_variable(script, *args++);
actor = get_actor(actorID);
actorIdleScript = actor->idleScript;
if (actorIdleScript != 0) {
if (actor->idleScript != 0) {
kill_script_by_ID(actor->idleScriptID);
actor->idleScript = 0;
}
actor->idleCode = var1;
newScriptContext = start_script(var1, 0x0A, 0);
actor->idleCode = var0;
newScriptContext = start_script(var0, 10, 0);
actor->idleScript = newScriptContext;
actor->idleScriptID = newScriptContext->id;
newScriptContext->owner1.enemyID = actorID;

10
src/code_1a1f0_len_5390.c
View File

@ -1,4 +1,5 @@
#include "common.h"
#include "functions.h"
s32 get_defeated(s32 mapID, s32 encounterID) {
EncounterStatus* currentEncounter = &gCurrentEncounter;
@ -124,22 +125,21 @@ ApiStatus HasMerleeCasts(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_8003F414);
/*
matches, but another function has the same name causing issues
ApiStatus func_8003F414(ScriptInstance* script, s32 isInitialCall) {
s32 tempVar0;
s32 tempVar1;
s32 tempVar2;
s32 tempConst0 = 6;
f32 tempConst1 = 1.2;
s32 tempConst2 = 30;
Bytecode* args = script->ptrReadPos;
tempVar0 = get_variable(script, *args++);
tempVar1 = get_variable(script, *args++);
tempVar2 = get_variable(script, *args++);
func_800720B0(6, tempVar0, tempVar1, tempVar2, 1.2f, 0x1E);
func_800720B0(tempConst0, tempVar0, tempVar1, tempVar2, tempConst1, tempConst2);
return ApiStatus_DONE2;
}
*/
ApiStatus func_8003F4CC(ScriptInstance* script, s32 isInitialCall) {
s32 tempVar0;

2
src/os/code_4ac90_len_3910.c
View File

@ -215,7 +215,7 @@ INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071FF0);
INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072050);
INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800720B0);
INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_800720B0, s32 tempConst0, f32 tempVar0, f32 tempVar1, f32 tempVar2, f32 tempConst1, s32 tempConst2);
INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072110);