mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-11 23:30:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

j2d / map_path work, d_drawlist / d_attention cleanup (#208)

Browse Source 
* work on fop actor / actor mng, daalink, d_a_obj_item

* d_a_title mostly decompiled

* daalink / d_event / JMessage / dmsg_out_font work

* msg_scrn_base / msg_scrn_boss

* some work on mDo machine, d_menu_save, d_tresure, and various

* remove asm

* progress

* finish d_menu_save / d_pane_class_alpha / d_pane_class / rename some data

* rename more data

* remove asm / progress

* match all of d_pane_class

* fixes / some dKankyo doc

* bunch of j2d work. d_drawlist / d_attention cleanup

* progress / asm

* cleanup wip

* decompile JStage

* setup some more JStudio structs

* set up d_demo classes

* some d_demo work

* cleanup dolphin os stuff

* some initial dEvent documentation

* some At collision documentation

* match JUTConsole::doDraw

* dbgs work / split up some of d_a_alink into .inc files

* d_a_alink_spinner work
This commit is contained in:
TakaRikka
2022-08-30 14:22:17 -07:00
committed by GitHub
parent bc30d007e1
commit f8979749e3
613 changed files with 30182 additions and 40087 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/rel/d/a/b/d_a_b_zant/d_a_b_zant.h
+185 -1
View File
@@ -1,6 +1,190 @@
#ifndef D_A_B_ZANT_H
#define D_A_B_ZANT_H
#include "dolphin/types.h"
#include "d/com/d_com_inf_game.h"
class daB_ZANT_c : public fopAc_ac_c {
public:
/* 8063E19C */ void ctrlJoint(J3DJoint*, J3DModel*);
/* 8063E264 */ void JointCallBack(J3DJoint*, int);
/* 8063E2B0 */ void draw();
/* 8063E5C4 */ void setBck(int, u8, f32, f32);
/* 8063E668 */ void checkBck(int);
/* 8063E6C4 */ void setActionMode(int, int);
/* 8063E6F8 */ void checkBigDamage();
/* 8063E79C */ void checkDamageType();
/* 8063E810 */ void setDamageSe(dCcD_Sph*, int);
/* 8063E938 */ void damage_check();
/* 8063F524 */ void ice_damage_check();
/* 8063F84C */ void setNextDamageMode(int);
/* 8063FAB4 */ void checkAvoidWeapon(int);
/* 8063FF6C */ void setTgHitBit(int);
/* 8063FFAC */ void setCoHitBit(int);
/* 8063FFEC */ void setTgShield(int);
/* 806400BC */ void setTgType(u32);
/* 806400C8 */ void setZantMessage(int);
/* 80640104 */ void doZantMessage();
/* 80640180 */ void setIceLandingEffect(int);
/* 80640310 */ void setWaterBubble();
/* 806403D4 */ void setMonkeyFallEffect();
/* 80640478 */ void setLastRollEffect();
/* 80640654 */ void getMagicSpeed();
/* 80640664 */ void getMagicWaterSpeed();
/* 80640674 */ void executeSmallAttack();
/* 80640C20 */ void calcScale(int);
/* 80640D14 */ void executeWarp();
/* 806412A8 */ void executeDamage();
/* 806414E4 */ void executeConfuse();
/* 80641640 */ void executeOpening();
/* 806427EC */ void executeFly();
/* 80642EC8 */ void executeFlyGround();
/* 806430E0 */ void checkSwimLinkNearMouth();
/* 806432F8 */ void checkSwimLinkNear();
/* 8064350C */ void executeHook();
/* 80643690 */ void executeWater();
/* 80644074 */ void executeSwim();
/* 80644A3C */ void executeSimaJump();
/* 80645014 */ void executeIceDemo();
/* 8064524C */ void executeIceJump();
/* 80645DA4 */ void executeIceStep();
/* 8064687C */ void executeIceDamage();
/* 806471CC */ void setFarPillarPos();
/* 806473E4 */ void setNearPillarPos();
/* 80647468 */ void setNextPillarInfo(int);
/* 806474F4 */ void setNextPillarPos();
/* 80647A34 */ void checkPillarSwing();
/* 80647AC8 */ void executeMonkey();
/* 806481F4 */ void executeMonkeyFall();
/* 80648544 */ void executeMonkeyDamage();
/* 80648778 */ void setLastWarp(int, int);
/* 80648F64 */ void executeLastStartDemo();
/* 806494A8 */ void executeLastAttack();
/* 8064A58C */ void executeLastTired();
/* 8064A688 */ void executeLastDamage();
/* 8064AC8C */ void executeLastEndDemo();
/* 8064B270 */ void calcMahojinAnime();
/* 8064B49C */ void calcRoomChangeCamera(int);
/* 8064B69C */ void initNextRoom();
/* 8064B868 */ void executeRoomChange();
/* 8064C1C0 */ void setBaseActionMode(int);
/* 8064C5A8 */ void action();
/* 8064CB1C */ void mtx_set();
/* 8064CD0C */ void cc_set();
/* 8064CFA8 */ void cc_ice_set();
/* 8064DA48 */ void execute();
/* 8064DB70 */ void _delete();
/* 8064DC04 */ void CreateHeap();
/* 8064E190 */ void create();
private:
/* 0x0568 */ u8 field_0x568[0x58e - 0x568];
/* 0x058E */ u16 field_0x58e;
/* 0x0590 */ u8 field_0x590[0x5ac - 0x590];
/* 0x05AC */ request_of_phase_process_class mPhase;
/* 0x05B4 */ mDoExt_McaMorfSO* mpMorfSO;
/* 0x05B8 */ J3DModel* field_0x5b8;
/* 0x05BC */ J3DModel* field_0x5bc;
/* 0x05C0 */ J3DModel* field_0x5c0;
/* 0x05C4 */ J3DModel* field_0x5c4;
/* 0x05C8 */ mDoExt_brkAnm* field_0x5c8;
/* 0x05CC */ mDoExt_btkAnm* field_0x5cc;
/* 0x05D0 */ mDoExt_btkAnm* field_0x5d0;
/* 0x05D4 */ mDoExt_brkAnm* field_0x5d4;
/* 0x05D8 */ mDoExt_btkAnm* field_0x5d8;
/* 0x05DC */ u8 field_0x5dc[0x5e8 - 0x5dc];
/* 0x05E8 */ u8 field_0x5e8;
/* 0x05E9 */ u8 field_0x5e9;
/* 0x05EC */ f32 field_0x5ec;
/* 0x05F0 */ Z2CreatureEnemy mZ2Enemy;
/* 0x0680 */ u8 field_0x680[0x6a0 - 0x680];
/* 0x06A0 */ cXyz mFlyWarpPos;
/* 0x06AC */ cXyz field_0x6ac;
/* 0x06B8 */ s16 field_0x6b8;
/* 0x06BA */ s16 field_0x6ba;
/* 0x06BC */ f32 field_0x6bc;
/* 0x06C0 */ f32 field_0x6c0;
/* 0x06C4 */ f32 field_0x6c4;
/* 0x06C8 */ f32 field_0x6c8;
/* 0x06CC */ f32 field_0x6cc;
/* 0x06D0 */ f32 field_0x6d0;
/* 0x06D4 */ int mActionID;
/* 0x06D8 */ int mLastActionID;
/* 0x06DC */ int mActionMode;
/* 0x06E0 */ u32 field_0x6e0;
/* 0x06E4 */ u16 field_0x6e4;
/* 0x06E8 */ int field_0x6e8;
/* 0x06EC */ int field_0x6ec;
/* 0x06F0 */ int field_0x6f0;
/* 0x06F4 */ int field_0x6f4;
/* 0x06F8 */ s16 field_0x6f8;
/* 0x06FA */ u8 field_0x6fa;
/* 0x06FB */ u8 mFightPhase;
/* 0x06FC */ u8 field_0x6fc;
/* 0x06FD */ u8 field_0x6fd;
/* 0x06FE */ u8 mFlyWarpPosID;
/* 0x06FF */ u8 field_0x6ff;
/* 0x0700 */ u8 field_0x700;
/* 0x0701 */ u8 field_0x701;
/* 0x0702 */ u8 field_0x702;
/* 0x0703 */ u8 field_0x703;
/* 0x0704 */ u8 field_0x704;
/* 0x0705 */ u8 field_0x705;
/* 0x0706 */ u8 field_0x706;
/* 0x0707 */ u8 field_0x707;
/* 0x0708 */ u8 field_0x708;
/* 0x0709 */ u8 field_0x709;
/* 0x070A */ u8 field_0x70a;
/* 0x070B */ u8 field_0x70b;
/* 0x070C */ u8 field_0x70c;
/* 0x070D */ u8 field_0x70d;
/* 0x070E */ u8 field_0x70e;
/* 0x070F */ u8 field_0x70f;
/* 0x0710 */ u8 field_0x710;
/* 0x0711 */ u8 field_0x711;
/* 0x0712 */ u8 field_0x712;
/* 0x0713 */ u8 field_0x713;
/* 0x0714 */ u8 field_0x714;
/* 0x0715 */ u8 field_0x715;
/* 0x0716 */ u8 field_0x716;
/* 0x0717 */ u8 field_0x717;
/* 0x0718 */ u8 field_0x718;
/* 0x0719 */ bool mTakenBigDmg;
/* 0x071A */ u8 mFightCycle;
/* 0x071B */ u8 field_0x71b;
/* 0x071C */ u8 field_0x71c;
/* 0x071D */ u8 field_0x71d;
/* 0x071E */ s16 field_0x71e;
/* 0x0720 */ s16 field_0x720;
/* 0x0722 */ s16 field_0x722;
/* 0x0724 */ u32 field_0x724;
/* 0x0728 */ u8 field_0x728;
/* 0x072C */ u32 field_0x72c[4];
/* 0x073C */ u32 field_0x73c[9];
/* 0x0760 */ cXyz field_0x760;
/* 0x076C */ cXyz field_0x76c;
/* 0x0778 */ f32 field_0x778;
/* 0x077C */ f32 field_0x77c;
/* 0x0780 */ int mMsgNo;
/* 0x0784 */ int mMsgID;
/* 0x0788 */ msg_class* mpMsg;
/* 0x078C */ dBgS_AcchCir mAcchCir;
/* 0x07CC */ dBgS_Acch mAcch;
/* 0x09A4 */ dCcD_Stts mStts;
/* 0x09E0 */ dCcD_Sph field_0x9e0[2];
/* 0x0C50 */ dCcU_AtInfo mAtInfo;
/* 0x0C74 */ dCcD_Stts field_0xc74;
/* 0x0CB0 */ dCcD_Sph field_0xcb0[11];
/* 0x1A18 */ dCcD_Sph field_0x1a18[11];
/* 0x2780 */ dCcD_Sph field_0x2780[11];
/* 0x34E8 */ dCcD_Cyl field_0x34e8;
/* 0x3624 */ dCcD_Sph field_0x3624[2];
/* 0x3894 */ u32 field_0x3894;
/* 0x3898 */ u32 field_0x3898;
/* 0x389C */ u32 field_0x389c;
/* 0x38A0 */ u8 field_0x38a0[0x38ac - 0x38a0];
/* 0x38AC */ u32 field_0x38ac[2];
/* 0x38B4 */ u32 field_0x38b4;
/* 0x38B8 */ u8 field_0x38b8;
};
#endif /* D_A_B_ZANT_H */
include/rel/d/a/d_a_movie_player/d_a_movie_player.h
+32
View File
@@ -2,5 +2,37 @@
#define D_A_MOVIE_PLAYER_H
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
typedef void (*daMP_Func)();
class daMP_c : public fopAc_ac_c {
public:
/* 80031AD0 */ static void daMP_c_THPPlayerPlay();
/* 80031B24 */ void daMP_c_THPPlayerPause();
/* 80031A78 */ void daMP_c_Get_MovieRestFrame();
/* 80031AA4 */ void daMP_c_Set_PercentMovieVolume(f32);
/* 80878BB8 */ void daMP_c_Get_arg_demoNo();
/* 80878C04 */ void daMP_c_Get_arg_movieNo();
/* 80878C28 */ void daMP_c_Init();
/* 80878D64 */ void daMP_c_Finish();
/* 80878D94 */ void daMP_c_Main();
/* 80878DD8 */ void daMP_c_Draw();
/* 80878E60 */ void daMP_c_Callback_Init(fopAc_ac_c*);
/* 80878ED4 */ daMP_c();
/* 80878F18 */ void daMP_c_Callback_Finish(daMP_c*);
/* 80878F38 */ void daMP_c_Callback_Main(daMP_c*);
/* 80878F70 */ void daMP_c_Callback_Draw(daMP_c*);
static u8 m_myObj[4];
private:
/* 0x568 */ daMP_Func mpGetMovieRestFrame;
/* 0x56C */ daMP_Func mpSetPercentMovieVol;
/* 0x570 */ daMP_Func mpTHPGetTotalFrame;
/* 0x574 */ daMP_Func mpTHPPlay;
/* 0x578 */ daMP_Func mpTHPStop;
/* 0x57C */ daMP_Func mpTHPPause;
}; // Size: 0x580
#endif /* D_A_MOVIE_PLAYER_H */
include/rel/d/a/d_a_spinner/d_a_spinner.h
+96
View File
@@ -1,6 +1,102 @@
#ifndef D_A_SPINNER_H
#define D_A_SPINNER_H
#include "d/com/d_com_inf_game.h"
#include "dolphin/types.h"
class daSpinner_c : public fopAc_ac_c {
public:
/* 804D198C */ void createHeap();
/* 804D1A70 */ void create();
/* 804D1FD0 */ ~daSpinner_c();
/* 804D21E0 */ void setRoomInfo();
/* 804D2278 */ void setMatrix();
/* 804D2320 */ void setEffect();
/* 804D25F4 */ void posMove();
/* 804D3090 */ void setReflectAngle();
/* 804D3174 */ void setWallHit(s16, u32);
/* 804D34B0 */ void setAnm();
/* 804D3618 */ void setNextPathNum();
/* 804D3694 */ void getPathNextPos();
/* 804D36F4 */ void checkLineWallHit(cXyz*, cXyz*);
/* 804D3774 */ void checkPathMove();
/* 804D3D60 */ void setSpreadEffect();
/* 804D3F14 */ void clearSpreadEffect();
/* 804D3F8C */ void execute();
/* 804D4BB4 */ void draw();
void onPathForceRemove() { mPathForceRemove = true; }
void* checkPathMoveNow() { return mpPathMove; }
static u32 getWaitArg() { return 0; }
int getDeleteFlg() const { return mDeleteFlg; }
bool checkSpinnerTagEnd() const { return mSpinnerTag == 5; }
bool checkSpinnerTagIntoIncRot() const { return mSpinnerTag == 4; }
bool checkSpinnerTagInto() const { return mSpinnerTag == 3; }
u8 getButtonJump() const { return mButtonJump; }
u8 getJumpFlg() const { return mJumpFlg; }
void setMove(f32 speedF, s16 param_1) {
fopAcM_SetParam(this, 1);
mSpeedF = speedF;
field_0xa7a = param_1;
mCyl.OnAtSetBit();
}
bool reflectAccept() {
bool accept = false;
if (!mBck.isStop() && mSpinnerTag == 0) {
accept = true;
}
return accept;
}
MtxP getModelMtx() { return mpModel->getBaseTRMtx(); }
private:
/* 0x568 */ J3DModel* mpModel;
/* 0x56C */ mDoExt_bckAnm mBck;
/* 0x588 */ J3DAnmTransform* field_0x588;
/* 0x58C */ dBgS_AcchCir mAcchCir[3];
/* 0x64C */ dBgS_Acch mAcch;
/* 0x824 */ dBgS_LinkLinChk mLinChk;
/* 0x894 */ dPaPo_c field_0x894;
/* 0x8CC */ Z2SoundObjSimple field_0x8cc;
/* 0x8EC */ dCcD_Stts mStts;
/* 0x928 */ dCcD_Cyl mCyl;
/* 0xA64 */ void* mpPathMove;
/* 0xA68 */ void* field_0xa68;
/* 0xA6C */ u8 field_0xa6c;
/* 0xA6D */ u8 mJumpFlg;
/* 0xA6E */ u8 field_0xa6e;
/* 0xA6F */ u8 mSpinnerTag;
/* 0xA70 */ u8 mButtonJump;
/* 0xA71 */ u8 mDeleteFlg;
/* 0xA72 */ u8 field_0xa72;
/* 0xA73 */ u8 field_0xa73;
/* 0xA74 */ u8 field_0xa74;
/* 0xA75 */ u8 field_0xa75;
/* 0xA76 */ u8 field_0xa76;
/* 0xA77 */ u8 mPathForceRemove;
/* 0xA78 */ u8 field_0xa78;
/* 0xA79 */ u8 field_0xa79;
/* 0xA7A */ s16 field_0xa7a;
/* 0xA7C */ s16 field_0xa7c;
/* 0xA7E */ s16 field_0xa7e;
/* 0xA80 */ s16 field_0xa80;
/* 0xA82 */ s16 field_0xa82;
/* 0xA84 */ f32 field_0xa84;
/* 0xA88 */ f32 field_0xa88;
/* 0xA8C */ u32 field_0xa8c[2];
/* 0xA94 */ u32 field_0xa94;
/* 0xA98 */ cXyz field_0xa98;
/* 0xAA4 */ cXyz field_0xaa4;
/* 0xAB0 */ cXyz field_0xab0;
};
#endif /* D_A_SPINNER_H */
include/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.h
+26 -4
View File
@@ -2,16 +2,38 @@
#define D_A_TAG_MHINT_H
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
#include "d/msg/d_msg_flow.h"
struct daTagMhint_c {
class daTagMhint_c : public fopAc_ac_c {
public:
/* 805A56B8 */ void create();
/* 805A58E8 */ ~daTagMhint_c();
/* 805A5974 */ void eventOrder();
/* 805A5AE4 */ void execute();
bool checkNoAttention() const { return _0x56d == 0xFF; }
bool checkNoAttention() const { return field_0x56d == 0xFF; }
u8 _0[0x56d];
u8 _0x56d;
private:
/* 0x568 */ u8 field_0x568;
/* 0x569 */ u8 mSwitch;
/* 0x56A */ u8 field_0x56a;
/* 0x56B */ u8 field_0x56b;
/* 0x56C */ u8 mToolEventID;
/* 0x56D */ u8 field_0x56d;
/* 0x56E */ u8 field_0x56e;
/* 0x56F */ u8 field_0x56f;
/* 0x570 */ u8 field_0x570;
/* 0x571 */ u8 field_0x571;
/* 0x572 */ u8 field_0x572;
/* 0x574 */ u16 field_0x574;
/* 0x576 */ s16 mEventID;
/* 0x578 */ u16 field_0x578;
/* 0x57A */ u16 field_0x57a;
/* 0x57C */ u16 field_0x57c;
/* 0x57E */ u16 field_0x57e;
/* 0x580 */ dMsgFlow_c mMsgFlow;
/* 0x5CC */ f32 field_0x5cc;
/* 0x5D0 */ f32 field_0x5d0;
};
#endif /* D_A_TAG_MHINT_H */
include/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.h
+19 -4
View File
@@ -2,16 +2,31 @@
#define D_A_TAG_MSTOP_H
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
#include "d/msg/d_msg_flow.h"
struct daTagMstop_c {
class daTagMstop_c : public fopAc_ac_c {
public:
/* 805A6138 */ void create();
/* 805A6338 */ ~daTagMstop_c();
/* 805A63C4 */ void eventOrder();
/* 805A63F8 */ void execute();
bool checkNoAttention() const { return _0x56b == 0xFF; }
bool checkNoAttention() const { return field_0x56b == 0xFF; }
u8 _0[0x56b];
u8 _0x56b;
private:
/* 0x568 */ u8 field_0x568;
/* 0x569 */ u8 mSwitch;
/* 0x56A */ u8 field_0x56a;
/* 0x56B */ u8 field_0x56b;
/* 0x56C */ u8 field_0x56c;
/* 0x56D */ u8 field_0x56d;
/* 0x56E */ u16 field_0x56e;
/* 0x570 */ u16 field_0x570;
/* 0x572 */ u16 field_0x572;
/* 0x574 */ dMsgFlow_c mMsgFlow;
/* 0x5C0 */ f32 field_0x5cc;
/* 0x5C4 */ f32 field_0x5d0;
/* 0x5C8 */ cXyz field_0x5c8;
};
#endif /* D_A_TAG_MSTOP_H */