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

Rename func_802CE1C0 to SetNpcAnimationSpeed

Browse Source
This commit is contained in:
Jdog 2020-08-18 15:51:58 -07:00
parent cd11b621c3
commit d844156076
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/common_structs.h
View File

@ -62,7 +62,7 @@ typedef struct Npc {
/* 0x024 */ char unk_24[4]; /* 0x024 */ char unk_24[4];
/* 0x028 */ u32 currentAnim; /* 0x028 */ u32 currentAnim;
/* 0x02C */ char unk_2C[4]; /* 0x02C */ char unk_2C[4];
/* 0x030 */ f32 unk_30; /* 0x030 */ f32 animationSpeed;
/* 0x034 */ char unk_34[4]; /* 0x034 */ char unk_34[4];
/* 0x038 */ struct Vec3f pos; /* 0x038 */ struct Vec3f pos;
/* 0x044 */ struct Vec3f rotation; /* 0x044 */ struct Vec3f rotation;

6
src/code_f2470_len_27f0.c
View File

@ -127,14 +127,14 @@ ApiStatus GetNpcAnimation(ScriptInstance* script, s32 isInitialCall) {
} }
// TODO: Figure out meaning of float value in Npc struct that this function is setting // TODO: Figure out meaning of float value in Npc struct that this function is setting
ApiStatus func_802CE1C0(ScriptInstance* script, s32 isInitialCall) { ApiStatus SetNpcAnimationSpeed(ScriptInstance* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos; Bytecode* ptrReadPos = script->ptrReadPos;
NpcId npcID = get_variable(script, *ptrReadPos++); NpcId npcID = get_variable(script, *ptrReadPos++);
f32 value1 = get_float_variable(script, *ptrReadPos++); f32 animationSpeed = get_float_variable(script, *ptrReadPos++);
Npc* npcPtr = resolve_npc(script, npcID); Npc* npcPtr = resolve_npc(script, npcID);
if (npcPtr != NULL) { if (npcPtr != NULL) {
npcPtr->unk_30 = value1; npcPtr->animationSpeed = animationSpeed;
return ApiStatus_DONE2; // Doesn't match if omitted return ApiStatus_DONE2; // Doesn't match if omitted
} }
return ApiStatus_DONE2; return ApiStatus_DONE2;