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

near-match ActorSpeak

Browse Source 
just regalloc issues
This commit is contained in:
Alex Bates 2020-10-17 21:19:10 +01:00
parent 890fd346e9
commit bbeef1ff98
No known key found for this signature in database
GPG Key ID: 5E11C2DB78877706
3 changed files with 46 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
format.sh
View File

@ -21,7 +21,7 @@ astyle ${FILES} \
--lineend=linux \ --lineend=linux \
--convert-tabs \ --convert-tabs \
--max-code-length=120 \ --max-code-length=120 \
--min-conditional-indent=1 \ --min-conditional-indent=0 \
--style=attach \ --style=attach \
--align-pointer=type --align-reference=name \ --align-pointer=type --align-reference=name \
--indent-switches \ --indent-switches \

9
include/common_structs.h
View File

@ -10,6 +10,11 @@ struct ScriptInstance;
typedef ApiStatus(*ApiFunc)(struct ScriptInstance*, s32); typedef ApiStatus(*ApiFunc)(struct ScriptInstance*, s32);
typedef struct Vec2b {
/* 0x00 */ u8 x;
/* 0x01 */ u8 y;
} Vec2b; // size = 0x02
typedef struct Vec3f { typedef struct Vec3f {
/* 0x00 */ f32 x; /* 0x00 */ f32 x;
/* 0x04 */ f32 y; /* 0x04 */ f32 y;
@ -1263,7 +1268,7 @@ typedef struct Actor {
/* 0x137 */ char unk_137; /* 0x137 */ char unk_137;
/* 0x138 */ struct Vec3f homePos; /* 0x138 */ struct Vec3f homePos;
/* 0x144 */ struct Vec3f currentPos; /* 0x144 */ struct Vec3f currentPos;
/* 0x150 */ Vec3s otherPosheadOffset; /* 0x150 */ Vec3s headOffset;
/* 0x156 */ s16 healthBarPosition[3]; /* 0x156 */ s16 healthBarPosition[3];
/* 0x15C */ f32 rotation[3]; /* 0x15C */ f32 rotation[3];
/* 0x168 */ s16 rotationPivotOffset[3]; /* 0x168 */ s16 rotationPivotOffset[3];
@ -1272,7 +1277,7 @@ typedef struct Actor {
/* 0x17C */ f32 scaleModifier[3]; /* multiplies normal scale factors componentwise */ /* 0x17C */ f32 scaleModifier[3]; /* multiplies normal scale factors componentwise */
/* 0x188 */ f32 scalingFactor; /* 0x188 */ f32 scalingFactor;
/* 0x18C */ f32 yaw; /* 0x18C */ f32 yaw;
/* 0x190 */ u8 size[2]; /* 0x190 */ Vec2b size;
/* 0x192 */ s16 actorID; /* 0x192 */ s16 actorID;
/* 0x194 */ char unk_194[8]; /* 0x194 */ char unk_194[8];
/* 0x19C */ s32 actorTypeData1[6]; /* 4 = jump sound */ /* 0x19C */ s32 actorTypeData1[6]; /* 4 = jump sound */

71
src/code_181810.c
View File

@ -1,17 +1,5 @@
#include "common.h" #include "common.h"
// typedef struct DialogueState {
// /* 0x00 */ PrintContext* printCtx;
// /* 0x04 */ s32 unk_04;
// /* 0x08 */ s32 unk_08;
// /* 0x0C */ s32 talkAnim;
// /* 0x10 */ s32 idleAnim;
// /* 0x14 */ Actor* actor;
// /* 0x18 */ ActorPart* part;
// } DialogueState; // 0x8029FA60 size = unknown
// extern DialogueState gDialogueState;
extern PrintContext* gSpeakingActorPrintCtx; extern PrintContext* gSpeakingActorPrintCtx;
extern s32 gSpeakingActorPrintIsDone; // unk_08 extern s32 gSpeakingActorPrintIsDone; // unk_08
extern s32 gSpeakingActorTalkAnim; extern s32 gSpeakingActorTalkAnim;
@ -19,18 +7,21 @@ extern s32 gSpeakingActorIdleAnim;
extern Actor* gSpeakingActor; extern Actor* gSpeakingActor;
extern ActorPart* gSpeakingActorPart; extern ActorPart* gSpeakingActorPart;
INCLUDE_ASM(s32, "code_181810", ActorSpeak); #ifdef NON_MATCHING
/*ApiStatus ActorSpeak(ScriptInstance *script, s32 isInitialCall) { void clamp_printer_coords(PrintContext* printer, f32 x, f32 y);
// Register allocation issues, otherwise equivalent (?)
ApiStatus ActorSpeak(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
Actor *actor; Actor* actor;
ActorPart *part; ActorPart* part;
s32 stringID; s32 stringID;
s32 actorID; s32 actorID;
s32 partIndex; s32 partIndex;
PrintContext *printContext; PrintContext** printContext;
f32 speakerMouthY;
s32 anim; s32 anim;
f32 headX, headY, headZ;
f32 screenX, screenY, screenZ; f32 screenX, screenY, screenZ;
if (isInitialCall) { if (isInitialCall) {
@ -48,16 +39,22 @@ INCLUDE_ASM(s32, "code_181810", ActorSpeak);
gSpeakingActor = actor; gSpeakingActor = actor;
gSpeakingActorPart = part; gSpeakingActorPart = part;
headX = actor->currentPos.x + actor->headOffset.x;
if ((actor->flags & 0x8000) == 0) { if ((actor->flags & 0x8000) == 0) {
speakerMouthY = actor->otherPosheadOffset.y + actor->currentPos.y + actor->size[1]; headY = actor->size.y + (actor->currentPos.y + actor->headOffset.y);
} else { } else {
speakerMouthY = actor->otherPosheadOffset.y + actor->currentPos.y + (actor->size[1] / 2); headY = actor->headOffset.y + actor->currentPos.y + (actor->size.y / 2);
} }
headZ = actor->headOffset.z + actor->currentPos.z;
get_screen_coords(Cam_BATTLE, headX, headY, headZ, &screenX, &screenY, &screenZ);
get_screen_coords(Cam_BATTLE, actor->currentPos.x + actor->otherPosheadOffset.x, speakerMouthY, actor->currentPos.z + actor->otherPosheadOffset.z, &screenX, &screenY, &screenZ); {
gSpeakingActorPrintIsDone = 0; s32* isPrintDone = &gSpeakingActorPrintIsDone;
gSpeakingActorPrintCtx = load_string(stringID, &gSpeakingActorPrintIsDone); *isPrintDone = FALSE;
gSpeakingActorPrintCtx = load_string(stringID, isPrintDone);
}
clamp_printer_coords(gSpeakingActorPrintCtx, screenX, screenY); clamp_printer_coords(gSpeakingActorPrintCtx, screenX, screenY);
script->functionTemp[0] = 0; script->functionTemp[0] = 0;
D_8009A650[0] |= 0x10; D_8009A650[0] |= 0x10;
if (gSpeakingActorTalkAnim >= 0) { if (gSpeakingActorTalkAnim >= 0) {
@ -69,20 +66,25 @@ INCLUDE_ASM(s32, "code_181810", ActorSpeak);
if (script->functionTemp[0] == 0) { if (script->functionTemp[0] == 0) {
actor = gSpeakingActor; actor = gSpeakingActor;
part = gSpeakingActorPart; part = gSpeakingActorPart;
if ((actor->flags & 0x8000) == 0) {
speakerMouthY = actor->currentPos.y + actor->otherPosheadOffset.y + actor->size[1];
} else {
speakerMouthY = actor->currentPos.y + actor->otherPosheadOffset.y + (actor->size[1] / 2);
}
get_screen_coords(Cam_BATTLE, actor->currentPos.x + actor->otherPosheadOffset.x, speakerMouthY, actor->currentPos.z + actor->otherPosheadOffset.z, &screenX, &screenY, &screenZ);
clamp_printer_coords(printContext = gSpeakingActorPrintCtx, screenX, screenY);
if (printContext->stateFlags & 0x40) { headX = actor->currentPos.x + actor->headOffset.x;
if ((actor->flags & 0x8000) == 0) {
headY = actor->size.y + (actor->currentPos.y + actor->headOffset.y);
} else {
headY = actor->headOffset.y + actor->currentPos.y + (actor->size.y / 2);
}
headZ = actor->headOffset.z + actor->currentPos.z;
get_screen_coords(Cam_BATTLE, headX, headY, headZ, &screenX, &screenY, &screenZ);
printContext = &gSpeakingActorPrintCtx;
clamp_printer_coords(*printContext, screenX, screenY);
if ((*printContext)->stateFlags & 0x40) {
decrement_status_menu_disabled(); decrement_status_menu_disabled();
return ApiStatus_DONE1; return ApiStatus_DONE1;
} }
if (printContext->stateFlags & 0x80) { // "is talking" flag if ((*printContext)->stateFlags & 0x80) { // "is talking" flag
anim = gSpeakingActorTalkAnim; anim = gSpeakingActorTalkAnim;
} else { } else {
anim = gSpeakingActorIdleAnim; anim = gSpeakingActorIdleAnim;
@ -100,7 +102,10 @@ INCLUDE_ASM(s32, "code_181810", ActorSpeak);
} }
return ApiStatus_BLOCK; return ApiStatus_BLOCK;
}*/ }
#else
INCLUDE_ASM(s32, "code_181810", ActorSpeak);
#endif
INCLUDE_ASM(s32, "code_181810", EndActorSpeech); INCLUDE_ASM(s32, "code_181810", EndActorSpeech);