mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-27 23:45:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

npc_gnd finished, movie_player almost done (#2818)

Browse Source 
* movie_player mostly done

* d_a_npc_gnd done

* fix fshop debug match
This commit is contained in:
TakaRikka
2025-11-18 01:34:34 -08:00
committed by GitHub
parent 317d362c95
commit b3a3287475
11 changed files with 2019 additions and 1795 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1870,7 +1870,7 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_du"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_fairy"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_fguard"),
ActorRel(NonMatching, "d_a_npc_gnd"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_gnd"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_gra", extra_cflags=[DANPCF_C_HACK]),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_grc", extra_cflags=[DANPCF_C_HACK]),
ActorRel(NonMatching, "d_a_npc_grd"),
include/d/actor/d_a_mg_fshop.h
+22 -26
View File
@@ -19,7 +19,7 @@ struct fs_weed_s {
struct fs_tsubo_s {
/* 0x00 */ cXyz field_0x00;
/* 0x0C */ u8 field_0x0c[0x14 - 0x0c];
/* 0x14 */ J3DModel* field_0x14;
/* 0x14 */ J3DModel* model;
/* 0x18 */ u8 field_0x18[0x1C - 0x18];
/* 0x1C */ f32 field_0x1c;
/* 0x20 */ s16 field_0x20;
@@ -30,13 +30,13 @@ struct fs_tsubo_s {
struct fs_rod_s {
/* 0x00 */ cXyz field_0x00;
/* 0x0C */ u8 field_0x0C[0x14 - 0x0C];
/* 0x14 */ J3DModel* field_0x14;
/* 0x18 */ J3DModel* field_0x18[6];
/* 0x14 */ J3DModel* model;
/* 0x18 */ J3DModel* ringModel[6];
/* 0x30 */ mDoExt_3DlineMat0_c line_mat;
/* 0x4C */ int field_0x4c;
/* 0x50 */ u8 field_0x50[0x54 - 0x50];
/* 0x54 */ f32 field_0x54;
/* 0x58 */ s16 field_0x58;
/* 0x58 */ s16 rot_x;
};
struct fs_lure_s {
@@ -44,9 +44,8 @@ struct fs_lure_s {
/* 0x0C */ s16 field_0x0c;
/* 0x0E */ s16 field_0x0e;
/* 0x10 */ s16 field_0x10;
/* 0x12 */ u8 field_0x12[0x14 - 0x12];
/* 0x14 */ J3DModel* field_0x14;
/* 0x18 */ J3DModel* field_0x18[2];
/* 0x14 */ J3DModel* model;
/* 0x18 */ J3DModel* hookModel[2];
/* 0x20 */ u8 field_0x20[0x24 - 0x20];
/* 0x24 */ int field_0x24;
/* 0x28 */ f32 field_0x28;
@@ -60,18 +59,15 @@ struct fs_lure_s {
};
struct fs_koro2_s {
/* 0x00 */ J3DModel* mpModel;
/* 0x04 */ Mtx field_0x04;
/* 0x34 */ s8 field_0x34;
/* 0x35 */ u8 field_0x35[0x38 - 0x35];
/* 0x38 */ cXyz field_0x38;
/* 0x44 */ cXyz field_0x44;
/* 0x50 */ s16 field_0x50;
/* 0x52 */ u8 field_0x52[0x54 - 0x52];
/* 0x54 */ cXyz field_0x54;
/* 0x00 */ J3DModel* model;
/* 0x04 */ Mtx bgMtx;
/* 0x34 */ s8 part_id;
/* 0x38 */ cXyz pos;
/* 0x44 */ cXyz size;
/* 0x50 */ s16 rot_y;
/* 0x54 */ cXyz world_pos;
/* 0x60 */ u8 field_0x60;
/* 0x61 */ u8 field_0x61[0x64 - 0x61];
/* 0x64 */ dBgW* mpBgW;
/* 0x64 */ dBgW* bgw;
};
/**
@@ -93,12 +89,12 @@ public:
/* 0x1288 */ fs_weed_s mWeed[60];
/* 0x3F88 */ mDoExt_3DlineMat0_c field_0x3f88;
/* 0x3FA4 */ fs_tsubo_s mTsubo[2];
/* 0x3FF4 */ J3DModel* field_0x3ff4;
/* 0x3FF4 */ J3DModel* hatModel;
/* 0x3FF8 */ s16 field_0x3ff8;
/* 0x3FFA */ s16 field_0x3ffa;
/* 0x3FFC */ f32 field_0x3ffc;
/* 0x4000 */ f32 field_0x4000;
/* 0x4004 */ J3DModel* field_0x4004;
/* 0x4004 */ J3DModel* photoModel;
/* 0x4008 */ fshop_class* field_0x4008;
/* 0x400C */ u8 field_0x400c;
/* 0x400D */ u8 field_0x400d;
@@ -107,21 +103,21 @@ public:
/* 0x4014 */ cXyz field_0x4014;
/* 0x4020 */ csXyz field_0x4020;
/* 0x4028 */ J3DModel* mpA_crwaku_model;
/* 0x402C */ dBgW* field_0x402c;
/* 0x402C */ dBgW* koro2WakuBgw;
/* 0x4030 */ Mtx field_0x4030;
/* 0x4060 */ s16 field_0x4060;
/* 0x4062 */ s16 field_0x4062;
/* 0x4064 */ cXyz field_0x4064;
/* 0x4070 */ J3DModel* field_0x4070;
/* 0x4074 */ dBgS_AcchCir field_0x4074;
/* 0x40B4 */ dBgS_ObjAcch field_0x40b4;
/* 0x4070 */ J3DModel* ballModel;
/* 0x4074 */ dBgS_AcchCir ballAcchcir;
/* 0x40B4 */ dBgS_ObjAcch ballAcch;
/* 0x428C */ u8 field_0x428c;
/* 0x428D */ u8 field_0x428d;
/* 0x4290 */ fs_koro2_s mKoro2[100];
/* 0x6B30 */ J3DModel* field_0x6b30;
/* 0x6B30 */ J3DModel* canoeModel;
/* 0x6B34 */ s16 field_0x6b34;
/* 0x6B38 */ Mtx field_0x6b38;
/* 0x6B68 */ dBgW* field_0x6b68;
/* 0x6B68 */ dBgW* tableBgw;
/* 0x6B6C */ u32 field_0x6b6c[2];
/* 0x6B74 */ u8 field_0x6B74[0x6B7C - 0x6B74];
/* 0x6B7C */ u8 field_0x6b7c;
include/d/actor/d_a_movie_player.h
+44 -197
View File
@@ -1,106 +1,53 @@
#ifndef D_A_MOVIE_PLAYER_H
#define D_A_MOVIE_PLAYER_H
#include <dolphin/thp.h>
#include "f_op/f_op_actor.h"
#include "d/d_drawlist.h"
#ifdef __cplusplus
extern "C" {
#endif
struct daMP_THPReadBuffer {
u8* ptr;
s32 frameNumber;
BOOL isValid;
};
typedef u8 THPSample;
typedef s16 THPCoeff;
typedef f32 THPQuantTab[64];
typedef struct _THPHuffmanTab {
u8 quick[32];
u8 increment[32];
u8* Vij;
s32 maxCode[18];
s32 valPtr[18];
u8 Vij1;
u8 pad[11];
} THPHuffmanTab;
typedef struct _THPComponent {
u8 quantizationTableSelector;
u8 DCTableSelector;
u8 ACTableSelector;
THPCoeff predDC;
} THPComponent;
typedef struct _THPFileInfo {
THPQuantTab quantTabs[3];
THPHuffmanTab huffmanTabs[4];
THPComponent components[3];
u16 xPixelSize;
u16 yPixelSize;
u16 MCUsPerRow;
u16 decompressedY;
u8* c;
u32 currByte;
u32 cnt;
u8 validHuffmanTabs;
u8 RST;
u16 nMCU;
u16 currMCU;
u8* dLC[3];
} THPFileInfo;
typedef struct THPAudioRecordHeader {
u32 offsetNextChannel;
u32 sampleSize;
s16 lCoef[8][2];
s16 rCoef[8][2];
s16 lYn1;
s16 lYn2;
s16 rYn1;
s16 rYn2;
} THPAudioRecordHeader;
typedef struct THPAudioDecodeInfo {
u8* encodeData;
u32 offsetNibbles;
u8 predictor;
u8 scale;
s16 yn1;
s16 yn2;
} THPAudioDecodeInfo;
static u32 THPAudioDecode(s16* audioBuffer, u8* audioFrame, s32 flag);
static s32 __THPAudioGetNewSample(THPAudioDecodeInfo* info);
static void __THPAudioInitialize(THPAudioDecodeInfo* info, u8* ptr);
s32 __THPAudioGetNewSample(THPAudioDecodeInfo*);
void __THPAudioInitialize(THPAudioDecodeInfo*, u8*);
static void __THPSetupBuffers(void);
static u8 __THPReadFrameHeader(void);
static u8 __THPReadScaneHeader(void);
static u8 __THPReadQuantizationTable(void);
static u8 __THPReadHuffmanTableSpecification(void);
static void __THPHuffGenerateSizeTable(void);
static void __THPHuffGenerateCodeTable(void);
static void __THPHuffGenerateDecoderTables(u8 tabIndex);
static void __THPRestartDefinition(void);
static void __THPPrepBitStream(void);
static void __THPDecompressYUV(void* tileY, void* tileU, void* tileV);
static void __THPGQRRestore(void);
static void __THPDecompressiMCURow512x448(void);
static void __THPDecompressiMCURow640x480(void);
static void __THPDecompressiMCURowNxN(void);
static void __THPInverseDCTNoYPos(THPCoeff* in, u32 xPos);
static void __THPHuffDecodeDCTCompY(THPFileInfo* info, THPCoeff* block);
static void __THPHuffDecodeDCTCompU(THPFileInfo* info, THPCoeff* block);
static void __THPHuffDecodeDCTCompV(THPFileInfo* info, THPCoeff* block);
static void __THPInverseDCTY8(THPCoeff* in, u32 xPos);
static void __THPGQRSetup();
static s32 __THPHuffDecodeTab(THPFileInfo* info, THPHuffmanTab* h);
#ifdef __cplusplus
}
#endif
struct daMP_THPPlayer {
/* 0x000 */ DVDFileInfo fileInfo;
/* 0x03C */ THPHeader header;
/* 0x06C */ THPFrameCompInfo compInfo;
/* 0x080 */ THPVideoInfo videoInfo;
/* 0x08C */ THPAudioInfo audioInfo;
/* 0x09C */ void* thpWork;
/* 0x0A0 */ BOOL open;
/* 0x0A4 */ u8 state;
/* 0x0A5 */ u8 internalState;
/* 0x0A6 */ u8 playFlag;
/* 0x0A7 */ u8 audioExist;
/* 0x0A8 */ s32 dvdError;
/* 0x0AC */ s32 videoError;
/* 0x0B0 */ BOOL onMemory;
/* 0x0B4 */ u8* movieData;
/* 0x0B8 */ s32 initOffset;
/* 0x0BC */ s32 initReadSize;
/* 0x0C0 */ s32 initReadFrame;
/* 0x0C4 */ u32 curField;
/* 0x0C8 */ s64 retaceCount;
/* 0x0D0 */ s32 prevCount;
/* 0x0D4 */ s32 curCount;
/* 0x0D8 */ s32 videoDecodeCount;
/* 0x0DC */ f32 curVolume;
/* 0x0E0 */ f32 targetVolume;
/* 0x0E4 */ f32 deltaVolume;
/* 0x0E8 */ s32 rampCount;
/* 0x0EC */ s32 curAudioTrack;
/* 0x0F0 */ s32 curVideoNumber;
/* 0x0F4 */ s32 curAudioNumber;
/* 0x0F8 */ THPTextureSet* dispTextureSet;
/* 0x0FC */ THPAudioBuffer* playAudioBuffer;
/* 0x100 */ daMP_THPReadBuffer readBuffer[10];
/* 0x000 */ THPTextureSet textureSet[THP_TEXTURE_SET_COUNT];
/* 0x000 */ THPAudioBuffer audioBuffer[THP_AUDIO_BUFFER_COUNT];
};
/**
* @ingroup actors-unsorted
@@ -142,11 +89,6 @@ private:
STATIC_ASSERT(sizeof(daMP_c) == 0x580);
struct daMP_THPReadBuffer {
/* 0x00 */ void* m00;
/* 0x04 */ s32 m04;
};
class daMP_Dlst_base_c : public dDlst_base_c {
public:
/* 80878FD8 */ daMP_Dlst_base_c() {}
@@ -154,103 +96,8 @@ public:
/* 80878DB8 */ virtual void draw();
};
struct THPVideoInfo {
/* 0x00 */ u32 field_0x0;
/* 0x04 */ u32 field_0x4;
/* 0x08 */ u8 field_0x8[0x0C - 0x08];
};
struct THPAudioInfo {
/* 0x00 */ u8 field_0x0[0xC - 0x0];
/* 0x0C */ u32 field_0xc;
};
// made up
struct daMP_Player_c {
/* 0x000 */ DVDFileInfo mFileInfo;
/* 0x03C */ char* field_0x3c;
/* 0x040 */ int field_0x40;
/* 0x044 */ int field_0x44;
/* 0x048 */ int field_0x48;
/* 0x04C */ f32 field_0x4c;
/* 0x050 */ u32 mTotalFrames;
/* 0x054 */ int field_0x54;
/* 0x058 */ int field_0x58;
/* 0x05C */ int field_0x5c;
/* 0x060 */ int field_0x60;
/* 0x064 */ int field_0x64;
/* 0x068 */ u8 field_0x68[0x06C - 0x068];
struct {
u32 _0;
u8 _4;
u8 _5[0x14 - 0x5];
} /* 0x06C */ field_0x6c; // not sure if this is right
/* 0x080 */ THPVideoInfo mVideoInfo;
/* 0x08C */ THPAudioInfo mAudioInfo;
/* 0x09C */ int field_0x9c;
/* 0x0A0 */ int field_0xa0;
/* 0x0A4 */ u8 mState;
/* 0x0A5 */ u8 field_0xa5;
/* 0x0A6 */ u8 field_0xa6;
/* 0x0A7 */ u8 field_0xa7;
/* 0x0A8 */ int field_0xa8;
/* 0x0AC */ int field_0xac;
/* 0x0B0 */ int field_0xb0;
/* 0x0B4 */ int field_0xb4;
/* 0x0B8 */ int field_0xb8;
/* 0x0BC */ int field_0xbc;
/* 0x0C0 */ int field_0xc0;
/* 0x0C4 */ u8 field_0xC4[0x0C8 - 0x0C4];
/* 0x0C8 */ s64 field_0xc8;
/* 0x0D0 */ int field_0xd0;
/* 0x0D4 */ int field_0xd4;
/* 0x0D8 */ int field_0xd8;
/* 0x0DC */ f32 field_0xdc;
/* 0x0E0 */ f32 field_0xe0;
/* 0x0E4 */ f32 field_0xe4;
/* 0x0E8 */ int field_0xe8;
/* 0x0EC */ int field_0xec;
/* 0x0F0 */ int field_0xf0;
/* 0x0F4 */ int field_0xf4;
/* 0x0F8 */ int field_0xf8;
/* 0x0FC */ int field_0xfc;
/* 0x100 */ int field_0x100;
/* 0x104 */ u8 field_0x104[0x10C - 0x104];
/* 0x10C */ int field_0x10c;
/* 0x110 */ u8 field_0x110[0x118 - 0x110];
/* 0x118 */ int field_0x118;
/* 0x11C */ u8 field_0x11C[0x124 - 0x11C];
/* 0x124 */ int field_0x124;
/* 0x128 */ u8 field_0x128[0x130 - 0x128];
/* 0x130 */ int field_0x130;
/* 0x134 */ u8 field_0x134[0x13C - 0x134];
/* 0x13C */ int field_0x13c;
/* 0x140 */ u8 field_0x140[0x148 - 0x140];
/* 0x148 */ int field_0x148;
/* 0x14C */ u8 field_0x14C[0x154 - 0x14C];
/* 0x154 */ int field_0x154;
/* 0x158 */ u8 field_0x158[0x160 - 0x158];
/* 0x160 */ int field_0x160;
/* 0x164 */ u8 field_0x164[0x16C - 0x164];
/* 0x16C */ int field_0x16c;
/* 0x170 */ u8 field_0x170[0x178 - 0x170];
/* 0x178 */ int field_0x178;
/* 0x17C */ int field_0x17c;
/* 0x180 */ int field_0x180;
/* 0x184 */ u8 field_0x184[0x1A8 - 0x184];
/* 0x1A8 */ int field_0x1a8;
/* 0x1AC */ int field_0x1ac;
/* 0x1B0 */ int field_0x1b0;
/* 0x1B4 */ int field_0x1b4;
/* 0x1B8 */ int field_0x1b8;
/* 0x1BC */ int field_0x1bc;
/* 0x1C0 */ int field_0x1c0;
/* 0x1C4 */ int field_0x1c4;
/* 0x1C8 */ int field_0x1c8;
};
inline s32 daMP_NEXT_READ_SIZE(daMP_THPReadBuffer* readBuf) {
return *(s32*)readBuf->m00;
return *(s32*)readBuf->ptr;
}
void daMP_PrepareReady(int);
include/d/actor/d_a_npc_gnd.h
+8 -9
View File
@@ -72,11 +72,11 @@ public:
/* 809BCA14 */ void setCollision();
/* 809BCB48 */ int drawDbgInfo();
/* 809BCB50 */ bool afterSetMotionAnm(int, int, f32, int);
/* 809BCCE8 */ void selectAction();
/* 809BCD30 */ void chkAction(int (daNpc_Gnd_c::*)(void*));
/* 809BCD5C */ void setAction(int (daNpc_Gnd_c::*)(void*));
/* 809BCE04 */ void wait(void*);
/* 809BD050 */ void talk(void*);
/* 809BCCE8 */ int selectAction();
/* 809BCD30 */ int chkAction(int (daNpc_Gnd_c::*)(void*));
/* 809BCD5C */ int setAction(int (daNpc_Gnd_c::*)(void*));
/* 809BCE04 */ int wait(void*);
/* 809BD050 */ int talk(void*);
/* 809BE2D0 */ daNpc_Gnd_c(
daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
daNpcT_motionAnmData_c const* i_motionAnmData,
@@ -96,16 +96,15 @@ public:
/* 809BE424 */ s32 getNeckJointNo() { return 3; }
/* 809BE42C */ s32 getBackboneJointNo() { return 1; }
static char* mCutNameList;
static char* mCutNameList[1];
static cutFunc mCutList[1];
private:
/* 0xE40 */ NPC_GND_HIO_CLASS* mpHIO;
/* 0xE44 */ dCcD_Cyl mCyl1;
/* 0xF80 */ u8 mType;
/* 0xF81 */ u8 field_0xf81[0xF84 - 0xF81];
/* 0xF84 */ u8 field_0xF84;
/* 0xF85 */ u8 field_0xF85[0xF9C - 0xF85];
/* 0xF84 */ int (daNpc_Gnd_c::*mNextAction)(void*);
/* 0xF90 */ int (daNpc_Gnd_c::*mAction)(void*);
/* 0xF9C */ u8 field_0xF9C;
};
include/dolphin/thp.h
+158
View File
@@ -0,0 +1,158 @@
#ifndef _DOLPHIN_THP_H_
#define _DOLPHIN_THP_H_
#ifdef __REVOLUTION_SDK__
#include <revolution/thp.h>
#else
#include <dolphin/types.h>
#ifdef __cplusplus
extern "C" {
#endif
typedef u8 THPSample;
typedef s16 THPCoeff;
typedef f32 THPQuantTab[64];
typedef struct _THPHuffmanTab {
u8 quick[32];
u8 increment[32];
u8* Vij;
s32 maxCode[18];
s32 valPtr[18];
u8 Vij1;
u8 pad[11];
} THPHuffmanTab;
typedef struct _THPComponent {
u8 quantizationTableSelector;
u8 DCTableSelector;
u8 ACTableSelector;
THPCoeff predDC;
} THPComponent;
typedef struct _THPFileInfo {
THPQuantTab quantTabs[3];
THPHuffmanTab huffmanTabs[4];
THPComponent components[3];
u16 xPixelSize;
u16 yPixelSize;
u16 MCUsPerRow;
u16 decompressedY;
u8* c;
u32 currByte;
u32 cnt;
u8 validHuffmanTabs;
u8 RST;
u16 nMCU;
u16 currMCU;
u8* dLC[3];
} THPFileInfo;
typedef struct THPAudioRecordHeader {
u32 offsetNextChannel;
u32 sampleSize;
s16 lCoef[8][2];
s16 rCoef[8][2];
s16 lYn1;
s16 lYn2;
s16 rYn1;
s16 rYn2;
} THPAudioRecordHeader;
typedef struct THPAudioDecodeInfo {
u8* encodeData;
u32 offsetNibbles;
u8 predictor;
u8 scale;
s16 yn1;
s16 yn2;
} THPAudioDecodeInfo;
typedef struct THPTextureSet {
u8* ytexture;
u8* utexture;
u8* vtexture;
s32 frameNumber;
} THPTextureSet;
typedef struct THPAudioBuffer {
s16* buffer;
s16* curPtr;
u32 validSample;
} THPAudioBuffer;
typedef struct THPVideoInfo {
u32 xSize;
u32 ySize;
u32 videoType;
} THPVideoInfo;
typedef struct THPAudioInfo {
u32 sndChannels;
u32 sndFrequency;
u32 sndNumSamples;
u32 sndNumTracks;
} THPAudioInfo;
typedef struct THPFrameCompInfo {
u32 numComponents;
u8 frameComp[16];
} THPFrameCompInfo;
typedef struct THPHeader {
/* 0x00 */ char magic[4];
/* 0x04 */ u32 version;
/* 0x08 */ u32 bufsize;
/* 0x0C */ u32 audioMaxSamples;
/* 0x10 */ f32 frameRate;
/* 0x14 */ u32 numFrames;
/* 0x18 */ u32 firstFrameSize;
/* 0x1C */ u32 movieDataSize;
/* 0x20 */ u32 compInfoDataOffsets;
/* 0x24 */ u32 offsetDataOffsets;
/* 0x28 */ u32 movieDataOffsets;
/* 0x2C */ u32 finalFrameDataOffsets;
} THPHeader;
#define THP_AUDIO_BUFFER_COUNT 3
#define THP_READ_BUFFER_COUNT 10
#define THP_TEXTURE_SET_COUNT 3
static u32 THPAudioDecode(s16* audioBuffer, u8* audioFrame, s32 flag);
static s32 __THPAudioGetNewSample(THPAudioDecodeInfo* info);
static void __THPAudioInitialize(THPAudioDecodeInfo* info, u8* ptr);
s32 __THPAudioGetNewSample(THPAudioDecodeInfo*);
void __THPAudioInitialize(THPAudioDecodeInfo*, u8*);
static void __THPSetupBuffers(void);
static u8 __THPReadFrameHeader(void);
static u8 __THPReadScaneHeader(void);
static u8 __THPReadQuantizationTable(void);
static u8 __THPReadHuffmanTableSpecification(void);
static void __THPHuffGenerateSizeTable(void);
static void __THPHuffGenerateCodeTable(void);
static void __THPHuffGenerateDecoderTables(u8 tabIndex);
static void __THPRestartDefinition(void);
static void __THPPrepBitStream(void);
static void __THPDecompressYUV(void* tileY, void* tileU, void* tileV);
static void __THPGQRRestore(void);
static void __THPDecompressiMCURow512x448(void);
static void __THPDecompressiMCURow640x480(void);
static void __THPDecompressiMCURowNxN(void);
static void __THPInverseDCTNoYPos(THPCoeff* in, u32 xPos);
static void __THPHuffDecodeDCTCompY(THPFileInfo* info, THPCoeff* block);
static void __THPHuffDecodeDCTCompU(THPFileInfo* info, THPCoeff* block);
static void __THPHuffDecodeDCTCompV(THPFileInfo* info, THPCoeff* block);
static void __THPInverseDCTY8(THPCoeff* in, u32 xPos);
static void __THPGQRSetup();
static s32 __THPHuffDecodeTab(THPFileInfo* info, THPHuffmanTab* h);
#ifdef __cplusplus
}
#endif
#endif
#endif // _DOLPHIN_THP_H_
include/m_Do/m_Do_graphic.h
+4
View File
@@ -78,6 +78,10 @@ public:
/* 80008078 */ static void onBlure();
/* 80008330 */ static void calcFade();
static void fadeIn(f32 fadeSpeed) {
fadeOut(-fadeSpeed);
}
static JUTFader* getFader() { return mFader; }
static void setFader(JUTFader* fader) {
JFWDisplay::getManager()->setFader(fader);
include/revolution/thp.h
+154
View File
@@ -0,0 +1,154 @@
#ifndef _REVOLUTION_THP_H_
#define _REVOLUTION_THP_H_
#include <revolution/types.h>
#ifdef __cplusplus
extern "C" {
#endif
typedef u8 THPSample;
typedef s16 THPCoeff;
typedef f32 THPQuantTab[64];
typedef struct _THPHuffmanTab {
u8 quick[32];
u8 increment[32];
u8* Vij;
s32 maxCode[18];
s32 valPtr[18];
u8 Vij1;
u8 pad[11];
} THPHuffmanTab;
typedef struct _THPComponent {
u8 quantizationTableSelector;
u8 DCTableSelector;
u8 ACTableSelector;
THPCoeff predDC;
} THPComponent;
typedef struct _THPFileInfo {
THPQuantTab quantTabs[3];
THPHuffmanTab huffmanTabs[4];
THPComponent components[3];
u16 xPixelSize;
u16 yPixelSize;
u16 MCUsPerRow;
u16 decompressedY;
u8* c;
u32 currByte;
u32 cnt;
u8 validHuffmanTabs;
u8 RST;
u16 nMCU;
u16 currMCU;
u8* dLC[3];
} THPFileInfo;
typedef struct THPAudioRecordHeader {
u32 offsetNextChannel;
u32 sampleSize;
s16 lCoef[8][2];
s16 rCoef[8][2];
s16 lYn1;
s16 lYn2;
s16 rYn1;
s16 rYn2;
} THPAudioRecordHeader;
typedef struct THPAudioDecodeInfo {
u8* encodeData;
u32 offsetNibbles;
u8 predictor;
u8 scale;
s16 yn1;
s16 yn2;
} THPAudioDecodeInfo;
typedef struct THPTextureSet {
u8* ytexture;
u8* utexture;
u8* vtexture;
s32 frameNumber;
} THPTextureSet;
typedef struct THPAudioBuffer {
s16* buffer;
s16* curPtr;
u32 validSample;
} THPAudioBuffer;
typedef struct THPVideoInfo {
u32 xSize;
u32 ySize;
u32 videoType;
} THPVideoInfo;
typedef struct THPAudioInfo {
u32 sndChannels;
u32 sndFrequency;
u32 sndNumSamples;
u32 sndNumTracks;
} THPAudioInfo;
typedef struct THPFrameCompInfo {
u32 numComponents;
u8 frameComp[16];
} THPFrameCompInfo;
typedef struct THPHeader {
/* 0x00 */ char magic[4];
/* 0x04 */ u32 version;
/* 0x08 */ u32 bufsize;
/* 0x0C */ u32 audioMaxSamples;
/* 0x10 */ f32 frameRate;
/* 0x14 */ u32 numFrames;
/* 0x18 */ u32 firstFrameSize;
/* 0x1C */ u32 movieDataSize;
/* 0x20 */ u32 compInfoDataOffsets;
/* 0x24 */ u32 offsetDataOffsets;
/* 0x28 */ u32 movieDataOffsets;
/* 0x2C */ u32 finalFrameDataOffsets;
} THPHeader;
#define THP_AUDIO_BUFFER_COUNT 3
#define THP_READ_BUFFER_COUNT 10
#define THP_TEXTURE_SET_COUNT 3
static u32 THPAudioDecode(s16* audioBuffer, u8* audioFrame, s32 flag);
static s32 __THPAudioGetNewSample(THPAudioDecodeInfo* info);
static void __THPAudioInitialize(THPAudioDecodeInfo* info, u8* ptr);
s32 __THPAudioGetNewSample(THPAudioDecodeInfo*);
void __THPAudioInitialize(THPAudioDecodeInfo*, u8*);
static void __THPSetupBuffers(void);
static u8 __THPReadFrameHeader(void);
static u8 __THPReadScaneHeader(void);
static u8 __THPReadQuantizationTable(void);
static u8 __THPReadHuffmanTableSpecification(void);
static void __THPHuffGenerateSizeTable(void);
static void __THPHuffGenerateCodeTable(void);
static void __THPHuffGenerateDecoderTables(u8 tabIndex);
static void __THPRestartDefinition(void);
static void __THPPrepBitStream(void);
static void __THPDecompressYUV(void* tileY, void* tileU, void* tileV);
static void __THPGQRRestore(void);
static void __THPDecompressiMCURow512x448(void);
static void __THPDecompressiMCURow640x480(void);
static void __THPDecompressiMCURowNxN(void);
static void __THPInverseDCTNoYPos(THPCoeff* in, u32 xPos);
static void __THPHuffDecodeDCTCompY(THPFileInfo* info, THPCoeff* block);
static void __THPHuffDecodeDCTCompU(THPFileInfo* info, THPCoeff* block);
static void __THPHuffDecodeDCTCompV(THPFileInfo* info, THPCoeff* block);
static void __THPInverseDCTY8(THPCoeff* in, u32 xPos);
static void __THPGQRSetup();
static s32 __THPHuffDecodeTab(THPFileInfo* info, THPHuffmanTab* h);
#ifdef __cplusplus
}
#endif
#endif // _REVOLUTION_THP_H_
src/d/actor/d_a_mg_fshop.cpp
+322 -1004
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_movie_player.cpp
+973 -400
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_npc_gnd.cpp
+331 -156
View File
@@ -6,8 +6,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_npc_gnd.h"
#include "dol2asm.h"
/* 809BE5BC-809BE5C4 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */
static int l_bmdData[1][2] = {
@@ -60,12 +58,11 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = {
};
/* 809BE640-809BE644 -00001 0004+00 1/1 0/0 0/0 .data mCutNameList__11daNpc_Gnd_c */
SECTION_DATA char* daNpc_Gnd_c::mCutNameList = "";
char* daNpc_Gnd_c::mCutNameList[1] = {""};
/* 809BE644-809BE650 0000A8 000C+00 2/2 0/0 0/0 .data mCutList__11daNpc_Gnd_c */
daNpc_Gnd_c::cutFunc daNpc_Gnd_c::mCutList[1] = {NULL};
/* ############################################################################################## */
/* 809BE4A0-809BE52C 000000 008C+00 6/6 0/0 0/0 .rodata m__17daNpc_Gnd_Param_c */
const daNpc_Gnd_HIOParam daNpc_Gnd_Param_c::m = {
280.0f,
@@ -138,8 +135,8 @@ int daNpc_Gnd_c::create() {
mType = getType();
mFlowNodeNo = getFlowNodeNo();
mTwilight = false;
int rv = loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
if (rv == cPhs_COMPLEATE_e) {
int phase_state = loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
if (phase_state == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0)) {
return cPhs_ERROR_e;
}
@@ -183,7 +180,7 @@ int daNpc_Gnd_c::create() {
mCreating = 0;
}
return rv;
return phase_state;
}
/* 809BB9D4-809BBC70 0004B4 029C+00 1/1 0/0 0/0 .text CreateHeap__11daNpc_Gnd_cFv */
@@ -256,7 +253,7 @@ int daNpc_Gnd_c::Draw() {
/* 809BBF44-809BBF64 000A24 0020+00 1/1 0/0 0/0 .text
* createHeapCallBack__11daNpc_Gnd_cFP10fopAc_ac_c */
int daNpc_Gnd_c::createHeapCallBack(fopAc_ac_c* i_this) {
return static_cast<daNpc_Gnd_c*>(i_this)->CreateHeap();
return ((daNpc_Gnd_c*)i_this)->CreateHeap();
}
/* 809BBF64-809BBFBC 000A44 0058+00 1/1 0/0 0/0 .text ctrlJointCallBack__11daNpc_Gnd_cFP8J3DJointi
@@ -264,8 +261,8 @@ int daNpc_Gnd_c::createHeapCallBack(fopAc_ac_c* i_this) {
int daNpc_Gnd_c::ctrlJointCallBack(J3DJoint* i_joint, int arg1) {
if (arg1 == 0) {
J3DModel* model = j3dSys.getModel();
daNpc_Gnd_c* i_this = reinterpret_cast<daNpc_Gnd_c*>(model->getUserArea());
if (i_this != 0) {
daNpc_Gnd_c* i_this = (daNpc_Gnd_c*)model->getUserArea();
if (i_this != NULL) {
i_this->ctrlJoint(i_joint, model);
}
}
@@ -275,11 +272,11 @@ int daNpc_Gnd_c::ctrlJointCallBack(J3DJoint* i_joint, int arg1) {
/* 809BBFBC-809BBFDC 000A9C 0020+00 1/1 0/0 0/0 .text getType__11daNpc_Gnd_cFv */
u8 daNpc_Gnd_c::getType() {
switch ((u8)fopAcM_GetParam(this)) {
case 0:
return TYPE_0;
default:
return TYPE_1;
switch (fopAcM_GetParam(this) & 0xFF) {
case 0:
return TYPE_0;
default:
return TYPE_1;
}
}
@@ -299,18 +296,18 @@ int daNpc_Gnd_c::isDelete() {
}
switch (mType) {
case TYPE_0:
return 0;
default: {
return 1;
}
case TYPE_0:
return 0;
default:
return 1;
}
}
/* 809BC028-809BC168 000B08 0140+00 1/1 0/0 0/0 .text reset__11daNpc_Gnd_cFv */
void daNpc_Gnd_c::reset() {
initialize();
memset(&field_0xF84, 0, (u8*)&field_0xF9C - (u8*)&field_0xF84);
memset(&mNextAction, 0, (u8*)&field_0xF9C - (u8*)&mNextAction);
for (int idx = 0; idx < 2; ++idx) {
if (mpMatAnm[idx] != NULL) {
mpMatAnm[idx]->initialize();
@@ -331,95 +328,209 @@ void daNpc_Gnd_c::afterJntAnm(int param_1) {
}
}
/* ############################################################################################## */
/* 809BE554-809BE558 0000B4 0004+00 3/3 0/0 0/0 .rodata @4552 */
SECTION_RODATA static f32 const lit_4552 = -1.0f;
COMPILER_STRIP_GATE(0x809BE554, &lit_4552);
/* 809BC1F4-809BC328 000CD4 0134+00 1/0 0/0 0/0 .text ctrlBtk__11daNpc_Gnd_cFv */
BOOL daNpc_Gnd_c::ctrlBtk() {
// NONMATCHING
return false; // Placeholder
if (mpMatAnm[0] != NULL && mpMatAnm[1] != NULL) {
if (field_0xe29 != 0 && mBtkAnm.getBtkAnm()) {
mpMatAnm[0]->setNowOffsetX(-1.0f * (0.2f * cM_ssin(mJntAnm.getEyeAngleY())));
mpMatAnm[0]->setNowOffsetY(0.2f * cM_ssin(mJntAnm.getEyeAngleX()));
mpMatAnm[1]->setNowOffsetX(0.2f * cM_ssin(mJntAnm.getEyeAngleY()));
mpMatAnm[1]->setNowOffsetY(0.2f * cM_ssin(mJntAnm.getEyeAngleX()));
if (field_0xe2a != 0) {
mpMatAnm[0]->setMorfFrm(field_0xe2a);
mpMatAnm[1]->setMorfFrm(field_0xe2a);
field_0xe2a = 0;
}
mpMatAnm[0]->onEyeMoveFlag();
mpMatAnm[1]->onEyeMoveFlag();
return 1;
}
if (field_0xe2a != 0) {
mpMatAnm[0]->setMorfFrm(field_0xe2a);
mpMatAnm[1]->setMorfFrm(field_0xe2a);
field_0xe2a = 0;
}
mpMatAnm[0]->offEyeMoveFlag();
mpMatAnm[1]->offEyeMoveFlag();
}
return 0;
}
/* 809BC328-809BC448 000E08 0120+00 1/0 0/0 0/0 .text setParam__11daNpc_Gnd_cFv */
void daNpc_Gnd_c::setParam() {
// NONMATCHING
u32 attn_flags = (fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e);
selectAction();
srchActors();
s16 talk_distance = mpHIO->m.common.talk_distance;
s16 talk_angle = mpHIO->m.common.talk_angle;
s16 attention_distance = mpHIO->m.common.attention_distance;
s16 attention_angle = mpHIO->m.common.attention_angle;
attention_info.distances[fopAc_attn_LOCK_e] = daNpcT_getDistTableIdx(attention_distance, attention_angle);
attention_info.distances[fopAc_attn_TALK_e] = attention_info.distances[fopAc_attn_LOCK_e];
attention_info.distances[fopAc_attn_SPEAK_e] = daNpcT_getDistTableIdx(talk_distance, talk_angle);
attention_info.flags = attn_flags;
scale.set(mpHIO->m.common.scale, mpHIO->m.common.scale, mpHIO->m.common.scale);
mCcStts.SetWeight(mpHIO->m.common.weight);
mCylH = mpHIO->m.common.height;
mWallR = mpHIO->m.common.width;
mAttnFovY = mpHIO->m.common.fov;
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(mpHIO->m.common.knee_length);
mRealShadowSize = mpHIO->m.common.real_shadow_size;
gravity = mpHIO->m.common.gravity;
mExpressionMorfFrame = mpHIO->m.common.expression_morf_frame;
mMorfFrames = mpHIO->m.common.morf_frame;
mAcch.SetGrndNone();
mAcch.SetWallNone();
gravity = 0.0f;
}
/* 809BC448-809BC4A8 000F28 0060+00 1/0 0/0 0/0 .text setAfterTalkMotion__11daNpc_Gnd_cFv
*/
void daNpc_Gnd_c::setAfterTalkMotion() {
// NONMATCHING
mFaceMotionSeqMngr.getNo();
mFaceMotionSeqMngr.setNo(0, -1.0f, 0, 0);
}
/* 809BC4A8-809BC4AC 000F88 0004+00 1/1 0/0 0/0 .text srchActors__11daNpc_Gnd_cFv */
void daNpc_Gnd_c::srchActors() {
/* empty function */
}
void daNpc_Gnd_c::srchActors() {}
/* 809BC4AC-809BC5AC 000F8C 0100+00 1/0 0/0 0/0 .text evtTalk__11daNpc_Gnd_cFv */
BOOL daNpc_Gnd_c::evtTalk() {
// NONMATCHING
return false; // Placeholder
if (chkAction(&daNpc_Gnd_c::talk)) {
(this->*mAction)(NULL);
} else {
mPreItemNo = 0;
if (dComIfGp_event_chkTalkXY()) {
if (!dComIfGp_evmng_ChkPresentEnd()) {
return TRUE;
}
mEvtNo = 1;
evtChange();
return TRUE;
} else {
setAction(&daNpc_Gnd_c::talk);
}
}
return TRUE;
}
/* 809BC5AC-809BC674 00108C 00C8+00 1/0 0/0 0/0 .text evtCutProc__11daNpc_Gnd_cFv */
BOOL daNpc_Gnd_c::evtCutProc() {
// NONMATCHING
return false; // Placeholder
BOOL rt = FALSE;
s32 staffId = dComIfGp_getEventManager().getMyStaffId("Gnd", this, -1);
if (staffId != -1) {
mStaffId = staffId;
int actIdx = dComIfGp_getEventManager().getMyActIdx(mStaffId, mCutNameList, 1, FALSE, FALSE);
if ((this->*mCutList[actIdx])(mStaffId)) {
dComIfGp_getEventManager().cutEnd(mStaffId);
}
rt = TRUE;
}
return rt;
}
/* 809BC674-809BC760 001154 00EC+00 1/0 0/0 0/0 .text action__11daNpc_Gnd_cFv */
void daNpc_Gnd_c::action() {
// NONMATCHING
if (mStagger.checkRebirth()) {
mStagger.initialize();
mMode = MODE_INIT;
}
if (mNextAction) {
if (mAction == mNextAction) {
(this->*mAction)(NULL);
} else {
setAction(mNextAction);
}
}
}
/* 809BC760-809BC7D8 001240 0078+00 1/0 0/0 0/0 .text beforeMove__11daNpc_Gnd_cFv */
void daNpc_Gnd_c::beforeMove() {
// NONMATCHING
if (checkHide() || mNoDraw) {
attention_info.flags = 0;
}
}
/* ############################################################################################## */
/* 809BE558-809BE55C 0000B8 0004+00 0/1 0/0 0/0 .rodata @4723 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4723 = 10.0f;
COMPILER_STRIP_GATE(0x809BE558, &lit_4723);
#pragma pop
/* 809BE55C-809BE560 0000BC 0004+00 0/1 0/0 0/0 .rodata @4724 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4724 = 30.0f;
COMPILER_STRIP_GATE(0x809BE55C, &lit_4724);
#pragma pop
/* 809BE560-809BE568 0000C0 0004+04 0/1 0/0 0/0 .rodata @4725 */
#pragma push
#pragma force_active on
SECTION_RODATA static u32 const lit_4725[1 + 1 /* padding */] = {
0x38C90FDB,
/* padding */
0x00000000,
};
COMPILER_STRIP_GATE(0x809BE560, &lit_4725);
#pragma pop
/* 809BE568-809BE570 0000C8 0008+00 1/3 0/0 0/0 .rodata @4727 */
SECTION_RODATA static u8 const lit_4727[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x809BE568, &lit_4727);
/* 809BC7D8-809BCA14 0012B8 023C+00 1/0 0/0 0/0 .text setAttnPos__11daNpc_Gnd_cFv */
void daNpc_Gnd_c::setAttnPos() {
// NONMATCHING
cXyz cStack_3c(10.0f, 30.0f, 0.0f);
cXyz cStack_48(10.0f, 0.0f, 0.0f);
mStagger.calc(FALSE);
f32 rad = cM_s2rad((s16)(mCurAngle.y - field_0xd7e.y));
mJntAnm.setParam(this, mpMorf[0]->getModel(), &cStack_3c, getBackboneJointNo(),
getNeckJointNo(), getHeadJointNo(), mpHIO->m.common.body_angleX_min,
mpHIO->m.common.body_angleX_max, mpHIO->m.common.body_angleY_min,
mpHIO->m.common.body_angleY_max, mpHIO->m.common.head_angleX_min,
mpHIO->m.common.head_angleX_max, mpHIO->m.common.head_angleY_min,
mpHIO->m.common.head_angleY_max, mpHIO->m.common.neck_rotation_ratio, rad,
&cStack_48);
mJntAnm.calcJntRad(0.2f, 1.0f, rad);
setMtx();
mDoMtx_stack_c::copy(mpMorf[0]->getModel()->getAnmMtx(getHeadJointNo()));
mDoMtx_stack_c::multVec(&cStack_3c, &eyePos);
mJntAnm.setEyeAngleX(eyePos, 1.0f, 0);
mJntAnm.setEyeAngleY(eyePos, mCurAngle.y, FALSE, 1.0f, 0);
attention_info.position = current.pos;
attention_info.position.y += mpHIO->m.common.attention_offset;
}
/* 809BCA14-809BCB48 0014F4 0134+00 1/0 0/0 0/0 .text setCollision__11daNpc_Gnd_cFv */
void daNpc_Gnd_c::setCollision() {
// NONMATCHING
cXyz pos;
u32 tgType = 0xD8FBFDFF;
u32 tgSPrm = 0x1F;
if (!mHide) {
if (dComIfGp_event_runCheck()) {
tgType = 0;
tgSPrm = 0;
} else {
if (mTwilight) {
tgType = 0;
tgSPrm = 0;
} else if (mStagger.checkStagger()) {
tgType = 0;
tgSPrm = 0;
}
}
f32 cylH = mCylH;
f32 wallR = mWallR;
pos = current.pos;
mCyl1.SetCoSPrm(0x79);
mCyl1.SetTgType(tgType);
mCyl1.SetTgSPrm(tgSPrm);
mCyl1.OnTgNoHitMark();
mCyl1.SetH(cylH);
mCyl1.SetR(wallR);
mCyl1.SetC(pos);
dComIfG_Ccsp()->Set(&mCyl1);
}
mCyl1.ClrCoHit();
mCyl1.ClrTgHit();
}
/* 809BCB48-809BCB50 001628 0008+00 1/0 0/0 0/0 .text drawDbgInfo__11daNpc_Gnd_cFv */
@@ -429,55 +540,186 @@ int daNpc_Gnd_c::drawDbgInfo() {
/* 809BCB50-809BCCE8 001630 0198+00 1/0 0/0 0/0 .text afterSetMotionAnm__11daNpc_Gnd_cFiifi */
bool daNpc_Gnd_c::afterSetMotionAnm(int param_0, int param_1, f32 param_2, int param_3) {
// NONMATCHING
return false; // Placeholder
static struct {
int _0;
int _4;
} brkAnmData[] = {
{0x11, 1},
};
static struct {
int _0;
int _4;
} bpkAnmData[] = {
{0x0E, 1},
};
J3DAnmTevRegKey* brk = NULL;
J3DAnmColor* bpk = NULL;
if (brkAnmData[param_0]._0 != -1) {
brk = getTevRegKeyAnmP(l_resNameList[brkAnmData[param_0]._4], brkAnmData[param_0]._0);
}
if (brk != NULL) {
if (mBrkAnm.getBrkAnm() == brk) {
mAnmFlags |= 0x100;
} else if (setBrkAnm(brk, mpMorf[0]->getModel()->getModelData(), 1.0f, param_1)) {
mAnmFlags |= 0x104;
}
}
if (brk == NULL && brkAnmData[param_0]._0 != -1) {
return 0;
}
if (bpkAnmData[param_0]._0 != -1) {
bpk = getColorAnmP(l_resNameList[bpkAnmData[param_0]._4], bpkAnmData[param_0]._0);
}
if (bpk != NULL) {
if (mBpkAnm.getBpkAnm() == bpk) {
mAnmFlags |= 0x200;
} else if (setBpkAnm(bpk, mpMorf[0]->getModel()->getModelData(), 1.0f, param_1)) {
mAnmFlags |= 0x208;
}
}
if (bpk == NULL && bpkAnmData[param_0]._0 != -1) {
return 0;
}
return 1;
}
/* 809BCCE8-809BCD30 0017C8 0048+00 1/1 0/0 0/0 .text selectAction__11daNpc_Gnd_cFv */
void daNpc_Gnd_c::selectAction() {
// NONMATCHING
int daNpc_Gnd_c::selectAction() {
mNextAction = NULL;
mNextAction = &daNpc_Gnd_c::wait;
return 1;
}
/* 809BCD30-809BCD5C 001810 002C+00 1/1 0/0 0/0 .text
* chkAction__11daNpc_Gnd_cFM11daNpc_Gnd_cFPCvPvPv_i */
void daNpc_Gnd_c::chkAction(int (daNpc_Gnd_c::*param_0)(void*)) {
// NONMATCHING
int daNpc_Gnd_c::chkAction(int (daNpc_Gnd_c::*i_action)(void*)) {
return mAction == i_action;
}
/* 809BCD5C-809BCE04 00183C 00A8+00 2/2 0/0 0/0 .text
* setAction__11daNpc_Gnd_cFM11daNpc_Gnd_cFPCvPvPv_i */
void daNpc_Gnd_c::setAction(int (daNpc_Gnd_c::*param_0)(void*)) {
// NONMATCHING
int daNpc_Gnd_c::setAction(int (daNpc_Gnd_c::*i_action)(void*)) {
mMode = MODE_EXIT;
if (mAction != NULL) {
(this->*(mAction))(NULL);
}
mMode = MODE_ENTER;
mAction = i_action;
if (mAction != NULL) {
(this->*(mAction))(NULL);
}
return 1;
}
/* 809BCE04-809BD050 0018E4 024C+00 1/0 0/0 0/0 .text wait__11daNpc_Gnd_cFPv */
void daNpc_Gnd_c::wait(void* param_0) {
// NONMATCHING
int daNpc_Gnd_c::wait(void* param_0) {
switch (mMode) {
case MODE_ENTER:
case MODE_INIT:
if (!mStagger.checkStagger()) {
mFaceMotionSeqMngr.setNo(0, -1.0f, FALSE, 0);
mMotionSeqMngr.setNo(0, -1.0f, FALSE, 0);
mMode = MODE_RUN;
}
case MODE_RUN:
if (!mStagger.checkStagger()) {
if (mPlayerActorMngr.getActorP()) {
mJntAnm.lookNone(0);
if (chkActorInSight(mPlayerActorMngr.getActorP(), mAttnFovY, mCurAngle.y)) {
mJntAnm.lookPlayer(0);
}
if (!srchPlayerActor() && home.angle.y == mCurAngle.y) {
mMode = MODE_INIT;
}
} else {
mJntAnm.lookNone(0);
if (home.angle.y != mCurAngle.y) {
if (field_0xe34 == 0) {
setAngle(home.angle.y);
mMode = MODE_INIT;
} else if (step(home.angle.y, -1, -1, 15, 0)) {
mMode = MODE_INIT;
}
attention_info.flags = 0;
} else {
srchPlayerActor();
}
}
}
break;
case MODE_EXIT:
break;
}
return 1;
}
/* 809BD050-809BD248 001B30 01F8+00 2/0 0/0 0/0 .text talk__11daNpc_Gnd_cFPv */
void daNpc_Gnd_c::talk(void* param_0) {
// NONMATCHING
int daNpc_Gnd_c::talk(void* param_0) {
switch (mMode) {
case MODE_ENTER:
case MODE_INIT:
if (!mStagger.checkStagger()) {
initTalk(mFlowNodeNo, NULL);
if (checkStep()) {
mStepMode = 0;
}
mMode = MODE_RUN;
}
case MODE_RUN:
if (!mStagger.checkStagger()) {
if (mTwilight || mCurAngle.y == fopAcM_searchPlayerAngleY(this)) {
if (talkProc(NULL, FALSE, NULL, FALSE)) {
mPlayerActorMngr.entry(daPy_getPlayerActorClass());
dComIfGp_event_reset();
mMode = MODE_EXIT;
}
mJntAnm.lookPlayer(0);
if (mTwilight) {
mJntAnm.lookNone(0);
}
} else {
mJntAnm.lookPlayer(0);
step(fopAcM_searchPlayerAngleY(this), -1, -1, 15, 0);
}
}
break;
case MODE_EXIT:
break;
}
return 0;
}
/* 809BD248-809BD268 001D28 0020+00 1/0 0/0 0/0 .text daNpc_Gnd_Create__FPv */
static int daNpc_Gnd_Create(void* i_this) {
return static_cast<daNpc_Gnd_c*>(i_this)->create();
return ((daNpc_Gnd_c*)i_this)->create();
}
/* 809BD268-809BD288 001D48 0020+00 1/0 0/0 0/0 .text daNpc_Gnd_Delete__FPv */
static int daNpc_Gnd_Delete(void* i_this) {
return static_cast<daNpc_Gnd_c*>(i_this)->Delete();
return ((daNpc_Gnd_c*)i_this)->Delete();
}
/* 809BD288-809BD2A8 001D68 0020+00 1/0 0/0 0/0 .text daNpc_Gnd_Execute__FPv */
static int daNpc_Gnd_Execute(void* i_this) {
return static_cast<daNpc_Gnd_c*>(i_this)->Execute();
return ((daNpc_Gnd_c*)i_this)->Execute();
}
/* 809BD2A8-809BD2C8 001D88 0020+00 1/0 0/0 0/0 .text daNpc_Gnd_Draw__FPv */
static int daNpc_Gnd_Draw(void* i_this) {
return static_cast<daNpc_Gnd_c*>(i_this)->Draw();
return ((daNpc_Gnd_c*)i_this)->Draw();
}
/* 809BD2C8-809BD2D0 001DA8 0008+00 1/0 0/0 0/0 .text daNpc_Gnd_IsDelete__FPv */
@@ -485,73 +727,6 @@ static int daNpc_Gnd_IsDelete(void* i_this) {
return 1;
}
/* ############################################################################################## */
/* 809BE570-809BE578 0000D0 0008+00 0/1 0/0 0/0 .rodata @4785 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4785[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x809BE570, &lit_4785);
#pragma pop
/* 809BE578-809BE580 0000D8 0008+00 0/1 0/0 0/0 .rodata @4786 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4786[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x809BE578, &lit_4786);
#pragma pop
/* 809BE580-809BE588 0000E0 0008+00 0/1 0/0 0/0 .rodata @4787 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4787[8] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x809BE580, &lit_4787);
#pragma pop
extern "C" void talk__11daNpc_Gnd_cFPv();
/* 809BE650-809BE65C -00001 000C+00 1/1 0/0 0/0 .data @4607 */
SECTION_DATA static void* lit_4607[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)talk__11daNpc_Gnd_cFPv,
};
/* 809BE65C-809BE668 -00001 000C+00 1/1 0/0 0/0 .data @4617 */
SECTION_DATA static void* lit_4617[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)talk__11daNpc_Gnd_cFPv,
};
/* 809BE668-809BE670 0000CC 0008+00 0/1 0/0 0/0 .data brkAnmData$4830 */
#pragma push
#pragma force_active on
SECTION_DATA static u8 brkAnmData[8] = {
0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x01,
};
#pragma pop
/* 809BE670-809BE678 0000D4 0008+00 0/1 0/0 0/0 .data bpkAnmData$4831 */
#pragma push
#pragma force_active on
SECTION_DATA static u8 bpkAnmData[8] = {
0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x01,
};
#pragma pop
extern "C" void wait__11daNpc_Gnd_cFPv();
/* 809BE678-809BE684 -00001 000C+00 1/1 0/0 0/0 .data @4881 */
SECTION_DATA static void* lit_4881[3] = {
(void*)NULL,
(void*)0xFFFFFFFF,
(void*)wait__11daNpc_Gnd_cFPv,
};
/* 809BE684-809BE6A4 -00001 0020+00 1/0 0/0 0/0 .data daNpc_Gnd_MethodTable */
static actor_method_class daNpc_Gnd_MethodTable = {
(process_method_func)daNpc_Gnd_Create,
src/d/actor/d_a_npc_henna.cpp
+2 -2
View File
@@ -1857,8 +1857,8 @@ static void demo_camera_shop(npc_henna_class* i_this) {
i_this->field_0x7b9 = 1;
for (s32 i = 0; i < 100; i++) {
koro = &fshop->field_0x4008->mKoro2[i];
if ((koro->field_0x34 >= 2 && koro->field_0x34 <= 5) ||
(koro->field_0x34 >= 8 && koro->field_0x34 <= 11))
if ((koro->part_id >= 2 && koro->part_id <= 5) ||
(koro->part_id >= 8 && koro->part_id <= 11))
{
fshop->field_0x4008->mKoro2[i].field_0x60 = 1;
}