mirror of https://github.com/zeldaret/tp
Misc cleanup (#2134)
* Merge remote-tracking branch 'upstream/main' * rm search terms alias (ended up not using it) * typo fix
This commit is contained in:
Pheenoh
GitHub
parent
a0a5d6b00a
commit
ddb1f42c69
11
Doxyfile
11
Doxyfile
|
|
@ -289,7 +289,8 @@ TAB_SIZE = 4
|
|||
# with the commands \{ and \} for these it is advised to use the version @{ and
|
||||
# @} or use a double escape (\\{ and \\})
|
||||
|
||||
ALIASES =
|
||||
ALIASES = ""
|
||||
|
||||
|
||||
# Commenting out for now
|
||||
# ALIASES = "meme=\xrefitem memes \"Meme\" \"Meme List\""
|
||||
|
|
@ -1423,7 +1424,13 @@ HTML_EXTRA_STYLESHEET = docs/doxygen-awesome-css-2.3.2/doxygen-awesome.css \
|
|||
# This tag requires that the tag GENERATE_HTML is set to YES.
|
||||
|
||||
HTML_EXTRA_FILES = docs/doxygen-awesome-css-2.3.2/doxygen-awesome-darkmode-toggle.js \
|
||||
docs/doxygen-awesome-css-2.3.2/doxygen-awesome-interactive-toc.js
|
||||
docs/doxygen-awesome-css-2.3.2/doxygen-awesome-interactive-toc.js \
|
||||
docs/doxygen-awesome-css-2.3.2/doxygen-awesome-fragment-copy-button.js \
|
||||
docs/doxygen-awesome-css-2.3.2/doxygen-awesome-paragraph-link.js \
|
||||
docs/doxygen-awesome-css-2.3.2/doxygen-awesome-tabs.js \
|
||||
docs/doxygen-awesome-css-2.3.2/logo.drawio.svg \
|
||||
docs/doxygen-awesome-css-2.3.2/doxygen-custom/toggle-alternative-theme.js
|
||||
|
||||
|
||||
# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output
|
||||
# should be rendered with a dark or light theme.
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1"/>
|
||||
|
||||
<!-- BEGIN opengraph metadata -->
|
||||
<meta property="og:title" content="Doxygen Awesome" />
|
||||
<meta property="og:title" content="Twilight Princess Decompilation" />
|
||||
<meta property="og:image" content="https://repository-images.githubusercontent.com/348492097/4f16df80-88fb-11eb-9d31-4015ff22c452" />
|
||||
<meta property="og:description" content="Custom CSS theme for doxygen html-documentation with lots of customization parameters." />
|
||||
<meta property="og:description" content="Documentation for the Twilight Princess codebase" />
|
||||
<meta property="og:url" content="https://jothepro.github.io/doxygen-awesome-css/" />
|
||||
<!-- END opengraph metadata -->
|
||||
|
||||
<!-- BEGIN twitter metadata -->
|
||||
<meta name="twitter:image:src" content="https://repository-images.githubusercontent.com/348492097/4f16df80-88fb-11eb-9d31-4015ff22c452" />
|
||||
<meta name="twitter:title" content="Doxygen Awesome" />
|
||||
<meta name="twitter:description" content="Custom CSS theme for doxygen html-documentation with lots of customization parameters." />
|
||||
<meta name="twitter:title" content="Twilight Princess Decompilation" />
|
||||
<meta name="twitter:description" content="Documentation for the Twilight Princess codebase" />
|
||||
<!-- END twitter metadata -->
|
||||
|
||||
<!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME-->
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="61px" height="74px" viewBox="-0.5 -0.5 61 74" content="<mxfile host="drawio-plugin" modified="2021-03-16T23:58:23.462Z" agent="5.0 (Macintosh; Intel Mac OS X 10_16_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.105 Safari/537.36" version="13.7.9" etag="JoeaGLJ54FcERO7YrWLQ" type="embed"><diagram id="JMB9aH8b_oZ7EWDuqJgx" name="Page-1">7VdNc5swEP01HDsjkGPDsSVJe+lMZnzoWYENaAwsI8ux6a+vCCtA4KSu62kmSS+M9LT7tB9P0uDxuDx8VaLOv2MKhRew9ODxay8Igigy3xZoCOC8AzIl0w7yB2AtfwKBjNCdTGHrGGrEQsvaBROsKki0gwmlcO+aPWDh7lqLDGbAOhHFHP0hU513aHjFBvwbyCy3O/uMVkphjQnY5iLF/QjiNx6PFaLuRuUhhqKtna1L53f7zGofmIJKn+RAcTyKYkfJUWC6sdlmCnc1mYHScDhWY3Fvzdk8Br/PzCgCsAStGmNCRJy2JDH4pIV8VMG+edS4rCcZcjMDSu+ZVP3fpwpV+rnVh5ndF5hsPP4l16VhvPbN8AErTWI0re7mMRaonpw5Y8tlHBvcsNzKwnpttVDaslZYgcXIhj3NFW56LS1bbrM44l6m4Wq5MLhxzEDfgZKmAKDWtUhklRFNgqVM7LYb0Enu8I9j9dkVC80KtgS6Lb3fGnYVgXSm/1Ez2fFu7oeTYA/CuIUWU1AILR9d/mN9pR3uUJqde7F88leOWhYLl2GLO5UAOY2FP+GxMm3c6CwNlXlKY9oompFZ3Rps59EOkuw8BoH2BTtNs8EfaZbUdYZkXQGuXhDgR9DYRBycXURj00D+UmMT2ktJLnr9B8HG0IzFcPkHYfUe3oPZqfOjMEiDs1+KEw5n9P/+/1f3f/gq1394lt7erqQ+0HVvpsPPRWc+/KHxm18=</diagram></mxfile>"><defs/><g><path d="M 13 57 L 13.01 57.01 L 15.87 50.14 L 18.37 43.14 L 20.91 36.15 L 23.67 29.25 L 26.4 22.33 Q 30 13 33.71 22.28 L 33.55 22.22 L 35.48 26.91 L 37.49 31.64 L 39.48 36.36 L 41.2 40.97 L 43.05 45.63" fill="none" stroke="#010508" stroke-opacity="0.1" stroke-width="6" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 47.51 56.77 L 47.65 56.93 L 45.43 54.91 L 43.41 53.11 L 41.43 51.35 L 39.63 49.8 L 37.48 47.86 L 37.39 47.64 L 39.79 47.17 L 41.9 45.98 L 44.24 45.37 L 46.48 44.52 L 48.62 43.4 L 48.54 43.39 L 48.58 46.09 L 48.04 48.74 L 48.04 51.43 L 47.8 54.1 L 47.51 56.77 Z Z" fill-opacity="0.1" fill="#010508" stroke="#010508" stroke-opacity="0.1" stroke-width="6" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/><path d="M 10 43 L 9.94 42.88 L 12.16 41.98 L 14.31 40.96 L 16.51 40.01 L 18.62 38.89 L 20.88 38.1 Q 30 34 40 34 L 40 33.75 L 42 33.83 L 44 33.8 L 46 33.79 L 48 34.05 L 50 34" fill="none" stroke="#010508" stroke-opacity="0.1" stroke-width="7" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 10 54 L 9.97 53.99 L 12.69 47.07 L 15.43 40.16 L 18.07 33.21 L 20.65 26.24 L 23.4 19.33 Q 27 10 30.71 19.28 L 30.66 19.26 L 32.46 23.91 L 34.55 28.66 L 36.26 33.27 L 38.35 38.03 L 40.05 42.63" fill="none" stroke="#1982d2" stroke-width="6" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 44.51 53.77 L 44.56 53.83 L 42.48 51.97 L 40.5 50.21 L 38.48 48.41 L 36.41 46.56 L 34.48 44.86 L 34.55 45.02 L 36.72 44 L 39 43.24 L 41.21 42.28 L 43.48 41.51 L 45.62 40.4 L 45.78 40.42 L 45.51 43.09 L 45.01 45.74 L 44.87 48.42 L 44.94 51.12 L 44.51 53.77 Z Z" fill="#1982d2" stroke="#1982d2" stroke-width="6" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/><path d="M 7 40 L 7.02 40.05 L 9.28 39.25 L 11.33 38 L 13.48 36.96 L 15.73 36.14 L 17.88 35.1 Q 27 31 37 31 L 37 30.79 L 39 31.11 L 41 30.85 L 43 30.78 L 45 30.89 L 47 31" fill="none" stroke="#1982d2" stroke-width="8" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="stroke"/></g></svg>
|
||||
|
After Width: | Height: | Size: 3.5 KiB |
|
|
@ -13,9 +13,10 @@ struct g_himo_s {
|
|||
|
||||
/**
|
||||
* @ingroup actors-enemies
|
||||
* @class b_gnd_class
|
||||
* @brief Ganondorf
|
||||
*
|
||||
* Hyrule Castle dungeon boss.
|
||||
* @details Hyrule Castle dungeon boss.
|
||||
*
|
||||
*/
|
||||
class b_gnd_class : public fopEn_enemy_c {
|
||||
|
|
|
|||
|
|
@ -2,5 +2,88 @@
|
|||
#define D_A_B_YO_H
|
||||
|
||||
#include "dolphin/types.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
|
||||
/**
|
||||
* @ingroup actors-enemies
|
||||
* @class daB_YO_c
|
||||
* @brief Blizzeta
|
||||
*
|
||||
* @details Snowpeak Ruins dungeon boss.
|
||||
*
|
||||
*/
|
||||
class daB_YO_c : public fopEn_enemy_c {
|
||||
public:
|
||||
/* 8062F51C */ void draw();
|
||||
/* 8062FBEC */ void onIceBreak(u16);
|
||||
/* 8062FC08 */ void setBck(int, u8, f32, f32);
|
||||
/* 8062FE0C */ void setActionMode(int, int);
|
||||
/* 8062FE18 */ void damage_check();
|
||||
/* 806300F4 */ void setBreakFrizad();
|
||||
/* 8063022C */ void setIcicleOperate(int);
|
||||
/* 806302B4 */ void setIcicleSubNumber();
|
||||
/* 80630330 */ void setWindowBreakEffect(int);
|
||||
/* 8063040C */ void setHensinEffect();
|
||||
/* 806305B8 */ void setLandingEffect(f32);
|
||||
/* 806306F0 */ void setBreakIceEffect();
|
||||
/* 8063089C */ void setWallHitEffect();
|
||||
/* 80630A9C */ void setChillEffect();
|
||||
/* 80630BF0 */ void setApperEffect();
|
||||
/* 80630CA0 */ void setApperEffect2();
|
||||
/* 80630DD8 */ void demo_skip(int);
|
||||
/* 80630E3C */ void DemoSkipCallBack(void*, int);
|
||||
/* 80630E70 */ void setYoMessage(int);
|
||||
/* 80630EAC */ void doYoMessage();
|
||||
/* 80630F28 */ void executeOpening();
|
||||
/* 80632598 */ void reflectFreeMove();
|
||||
/* 80632660 */ void calcFreeMove(f32);
|
||||
/* 8063290C */ void setReflectAngle();
|
||||
/* 806329CC */ void executeChase();
|
||||
/* 806331CC */ void executeSeriousDemo();
|
||||
/* 80633EDC */ void checkIcecleRevival();
|
||||
/* 80633F50 */ void createIcecleRevival(u8);
|
||||
/* 80634040 */ void executeJump();
|
||||
/* 80634548 */ void executeAttackIce();
|
||||
/* 8063476C */ void executeAttackYose();
|
||||
/* 80634CEC */ void checkDamageWithIceBreak();
|
||||
/* 80634E04 */ void executeAttackBody();
|
||||
/* 806352C8 */ void executeDemoRevival();
|
||||
/* 80635798 */ void executeDamage();
|
||||
/* 80635ABC */ void executeDeath();
|
||||
/* 80636E9C */ void reviseIceCenterPos(cXyz*);
|
||||
/* 80637048 */ void calcPlayerBufPos();
|
||||
/* 806374BC */ void action();
|
||||
/* 80637990 */ void mtx_set();
|
||||
/* 80637B30 */ void cc_set();
|
||||
/* 80637E10 */ void execute();
|
||||
/* 80637FC8 */ void _delete();
|
||||
/* 806380F8 */ void CreateHeap();
|
||||
/* 806388A0 */ void CreateHeap2();
|
||||
/* 806389C0 */ void create();
|
||||
|
||||
u8 getModelNo() { return mModelNo;}
|
||||
s16 getFrizadRollAngle() { return mRollAngle;}
|
||||
f32 getModeRarius() { return mModeRarius;}
|
||||
u8 getFrizadAttack() { return mFrizadAttack;}
|
||||
|
||||
private:
|
||||
/* 0x5AC */ u8 field_0x5ac[0xF54 - 0x5AC];
|
||||
/* 0xF54 */ f32 mModeRarius;
|
||||
/* 0xF58 */ u8 field_0xf58[0xF5C - 0xF58];
|
||||
/* 0xF5C */ s16 mRollAngle;
|
||||
/* 0xF5E */ u8 field_0xf5e[0xFA8 - 0xF5E];
|
||||
/* 0xFA8 */ u8 mModelNo;
|
||||
/* 0xFA9 */ u8 field_0xfa9[0xFAD - 0xFA9];
|
||||
/* 0xFAD */ u8 mFrizadAttack;
|
||||
};
|
||||
|
||||
struct daB_YO_HIO_c {
|
||||
/* 8062F46C */ daB_YO_HIO_c();
|
||||
/* 806395E4 */ ~daB_YO_HIO_c();
|
||||
};
|
||||
|
||||
struct daB_YOI_c {
|
||||
/* 8063A480 */ void setOperate(int);
|
||||
};
|
||||
|
||||
#endif /* D_A_B_YO_H */
|
||||
|
|
|
|||
|
|
@ -8,8 +8,11 @@
|
|||
|
||||
/**
|
||||
* @ingroup actors-doors
|
||||
* @class daBdoor_c
|
||||
* @brief Boss Door
|
||||
*
|
||||
* @details The door that leads to the boss room.
|
||||
*
|
||||
*/
|
||||
class daBdoor_c : public fopAc_ac_c {
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
/**
|
||||
* @file d_a_e_fz.h
|
||||
* This header contains information about the Mini Freezard actor.
|
||||
* @brief Freezard header file.
|
||||
*
|
||||
* @details This header contains information about the Mini Freezard actor.
|
||||
*
|
||||
*/
|
||||
|
||||
|
|
@ -10,10 +12,11 @@
|
|||
#include "Z2AudioLib/Z2Creature.h"
|
||||
#include "d/cc/d_cc_uty.h"
|
||||
#include "m_Do/m_Do_hostIO.h"
|
||||
#include "rel/d/a/b/d_a_b_yo/d_a_b_yo.h"
|
||||
|
||||
/**
|
||||
* \enum daE_FZ_Action
|
||||
* \brief Mini Freezard current action.
|
||||
* @enum daE_FZ_Action
|
||||
* @brief Mini Freezard current action.
|
||||
*
|
||||
*/
|
||||
enum daE_FZ_Action {
|
||||
|
|
@ -21,11 +24,13 @@ enum daE_FZ_Action {
|
|||
ACT_MOVE, /**< Mini Freezard is moving to attack. */
|
||||
ACT_ATTACK, /**< Mini Freezard is attacking. */
|
||||
ACT_DAMAGE, /**< Mini Freezard is damaged. */
|
||||
ACT_ROLLMOVE /**< Mini Freezard is spinning around Blizzeta. This action is only taken when actor is loaded in with parameter 3 (aka, during the Blizzeta fight).*/
|
||||
ACT_ROLLMOVE /**< Mini Freezard is spinning around Blizzeta.
|
||||
This action is only taken when actor is loaded in with parameter 3
|
||||
(during the Blizzeta fight).*/
|
||||
};
|
||||
|
||||
/**
|
||||
* \brief Temporary HIO struct to get a match. Remove later.
|
||||
* @brief Temporary HIO struct to get a match. Remove later.
|
||||
*
|
||||
*/
|
||||
struct daE_FZ_HIO_c_tmp {
|
||||
|
|
@ -50,8 +55,11 @@ struct daE_FZ_HIO_c_tmp {
|
|||
|
||||
/**
|
||||
* @ingroup actors-enemies
|
||||
* @class daE_FZ_c
|
||||
* @brief Mini Freezard
|
||||
*
|
||||
* @details Miniature Freezard enemy.
|
||||
*
|
||||
*/
|
||||
class daE_FZ_c : public fopEn_enemy_c {
|
||||
public:
|
||||
|
|
@ -79,63 +87,62 @@ public:
|
|||
private:
|
||||
/* 0x5AC */ request_of_phase_process_class mPhaseReq; /**< Phase request used when creating the actor. */
|
||||
/* 0x5B4 */ J3DModel* mpModel; /**< Pointer to the Mini Freezard's model. */
|
||||
/* 0x5B8 */ mDoExt_invisibleModel mInvisibleModel;
|
||||
/* 0x5B8 */ mDoExt_invisibleModel mInvisibleModel; /**< Invisible model used for the Mini Freezard. */
|
||||
/* 0x5C0 */ Z2CreatureEnemy mCreature; /**< Z2CreatureEnemy class used for playing sound effects. */
|
||||
/* 0x664 */ cXyz field_0x664;
|
||||
/* 0x670 */ cXyz field_0x670;
|
||||
/* 0x67C */ cXyz field_0x67c[4];
|
||||
/* 0x6AC */ cXyz field_0x6ac[4];
|
||||
/* 0x6DC */ cXyz field_0x6dc;
|
||||
/* 0x6E8 */ cXyz field_0x6e8;
|
||||
/* 0x6F4 */ s32 mActionMode; /**< Mini Freezard current action mode. */
|
||||
/* 0x6F8 */ s32 mActionPhase; /**< Mini Freezard phase of current action mode. */
|
||||
/* 0x6FC */ f32 field_0x6fc;
|
||||
/* 0x700 */ f32 mRadiusBase; /**< Base radius value used by mSph1 and mSph2. */
|
||||
/* 0x704 */ s16 field_0x704;
|
||||
/* 0x664 */ cXyz mUserWork; /**< ??? */
|
||||
/* 0x670 */ cXyz field_0x670; /**< Appears unused. Set to current position on actor creation. */
|
||||
/* 0x67C */ cXyz field_0x67c[4]; /**< ??? */
|
||||
/* 0x6AC */ cXyz field_0x6ac[4]; /**< ??? */
|
||||
/* 0x6DC */ cXyz field_0x6dc; /**< ??? */
|
||||
/* 0x6E8 */ cXyz field_0x6e8; /**< ??? */
|
||||
/* 0x6F4 */ s32 mActionMode; /**< Current action mode. */
|
||||
/* 0x6F8 */ s32 mActionPhase; /**< Current phase of @ref mActionMode. */
|
||||
/* 0x6FC */ f32 field_0x6fc; /**< ??? */
|
||||
/* 0x700 */ f32 mRadiusBase; /**< Base radius value used by @ref mTgCoSph and @ref mAtSph. */
|
||||
/* 0x704 */ s16 field_0x704; /**< ??? */
|
||||
/* 0x706 */ s16 mAngleFromPlayer; /**< Angle the mini freezard is from the player. */
|
||||
/* 0x708 */ s16 mLastWallHitAngle; /**< Angle of the last wall the mini freezard hit. */
|
||||
/* 0x70A */ u8 field_0x70A[0x70C - 0x70A];
|
||||
/* 0x70C */ s32 field_0x70c;
|
||||
/* 0x710 */ u8 field_0x710;
|
||||
/* 0x711 */ u8 field_0x711;
|
||||
/* 0x712 */ u8 field_0x712;
|
||||
/* 0x713 */ u8 field_0x713;
|
||||
/* 0x714 */ u8 field_0x714;
|
||||
/* 0x715 */ u8 field_0x715;
|
||||
/* 0x716 */ u8 field_0x716;
|
||||
/* 0x717 */ u8 field_0x717;
|
||||
/* 0x70C */ s32 field_0x70c; /**< ??? */
|
||||
/* 0x710 */ u8 field_0x710; /**< ??? */
|
||||
/* 0x711 */ u8 field_0x711; /**< ??? */
|
||||
/* 0x712 */ u8 field_0x712; /**< ??? */
|
||||
/* 0x713 */ u8 field_0x713; /**< ??? */
|
||||
/* 0x714 */ u8 field_0x714; /**< ??? */
|
||||
/* 0x715 */ u8 field_0x715; /**< ??? */
|
||||
/* 0x716 */ u8 field_0x716; /**< ??? */
|
||||
/* 0x717 */ u8 field_0x717; /**< ??? */
|
||||
/* 0x718 */ fopAc_ac_c* mpBlizzetaActor; /**< Pointer to Blizzeta's actor (if used). Used to figure out what the mini freezard's angle and positioning should be when Blizzeta is attacking with them. */
|
||||
/* 0x71C */ u32 field_0x71c[3];
|
||||
/* 0x728 */ u8 field_0x728[4];
|
||||
/* 0x72C */ dBgS_AcchCir mAcchCir;
|
||||
/* 0x76C */ dBgS_ObjAcch mObjAcch;
|
||||
/* 0x944 */ dCcD_Stts mStts;
|
||||
/* 0x980 */ dCcD_Sph mSph1; /**< Mini Freezard's sphere collider used for ? */
|
||||
/* 0xAB8 */ dCcD_Sph mSph2; /**< Mini Freezard's sphere collider used for attacking. */
|
||||
/* 0xBF0 */ dCcU_AtInfo mAtInfo;
|
||||
/* 0xC14 */ u8 field_0xc14;
|
||||
/* 0xC15 */ u8 field_0xc15;
|
||||
/* 0xC16 */ u8 field_0xc16;
|
||||
/* 0xC17 */ u8 field_0xc17;
|
||||
/* 0xC18 */ u8 field_0xc18;
|
||||
/* 0xC19 */ u8 field_0xc19;
|
||||
/* 0xC1A */ u8 field_0xc1a;
|
||||
/* 0xC1B */ u8 field_0xc1b;
|
||||
/* 0xC1C */ u8 field_0xc1c;
|
||||
/* 0xC1D */ u8 field_0xc1d;
|
||||
/* 0xC1E */ u8 field_0xc1e;
|
||||
/* 0xC1F */ u8 field_0xc1f;
|
||||
/* 0xC20 */ u8 field_0xc20;
|
||||
/* 0xC21 */ u8 field_0xc21;
|
||||
/* 0xC22 */ u8 field_0xc22;
|
||||
/* 0xC23 */ u8 field_0xc23;
|
||||
/* 0x71C */ u32 mParticleSet[3]; /**< Particle set */
|
||||
/* 0x728 */ u8 field_0x728[4]; /**< ??? */
|
||||
/* 0x72C */ dBgS_AcchCir mAcchCir; /**< Checks for actor collision with background circles? */
|
||||
/* 0x76C */ dBgS_ObjAcch mObjAcch; /**< Checks for actor collision with background objects. */
|
||||
/* 0x944 */ dCcD_Stts mStts; /**< Track Mini Freezard collider status. */
|
||||
/* 0x980 */ dCcD_Sph mTgCoSph; /**< Sphere collider used when Mini Freezard is attacked / pushed. */
|
||||
/* 0xAB8 */ dCcD_Sph mAtSph; /**< Sphere collider used when Mini Freezard is attacking. */
|
||||
/* 0xBF0 */ dCcU_AtInfo mAtInfo; /**< Tracks information when the Mini Freezard is attacked. */
|
||||
/* 0xC14 */ u8 field_0xc14; /**< ??? */
|
||||
/* 0xC15 */ u8 field_0xc15; /**< ??? */
|
||||
/* 0xC16 */ u8 field_0xc16; /**< ??? */
|
||||
/* 0xC17 */ u8 field_0xc17; /**< ??? */
|
||||
/* 0xC18 */ u8 field_0xc18; /**< ??? */
|
||||
/* 0xC19 */ u8 field_0xc19; /**< ??? */
|
||||
/* 0xC1A */ u8 field_0xc1a; /**< ??? */
|
||||
/* 0xC1B */ u8 field_0xc1b; /**< ??? */
|
||||
/* 0xC1C */ u8 field_0xc1c; /**< ??? */
|
||||
/* 0xC1D */ u8 field_0xc1d; /**< ??? */
|
||||
/* 0xC1E */ u8 field_0xc1e; /**< ??? */
|
||||
/* 0xC1F */ u8 field_0xc1f; /**< ??? */
|
||||
/* 0xC20 */ u8 field_0xc20; /**< ??? */
|
||||
/* 0xC21 */ u8 field_0xc21; /**< ??? */
|
||||
/* 0xC22 */ u8 field_0xc22; /**< ??? */
|
||||
/* 0xC23 */ u8 field_0xc23; /**< ??? */
|
||||
};
|
||||
STATIC_ASSERT(sizeof(daE_FZ_c) == 0xC24);
|
||||
|
||||
class daE_FZ_HIO_c : public mDoHIO_entry_c {
|
||||
class daE_FZ_HIO_c {
|
||||
public:
|
||||
/* 806BE94C */ daE_FZ_HIO_c();
|
||||
/* 806C1440 */ virtual ~daE_FZ_HIO_c();
|
||||
/* 806C1440 */ virtual ~daE_FZ_HIO_c() {};
|
||||
|
||||
public:
|
||||
/* 0x04 */ s8 field_0x04;
|
||||
|
|
@ -156,26 +163,4 @@ public:
|
|||
/* 0x34 */ f32 field_0x34;
|
||||
};
|
||||
|
||||
/**
|
||||
* \brief Blizzeta's actor class. Reference in proper header later when it has been reversed.
|
||||
*
|
||||
*/
|
||||
class daB_YO_c : public fopEn_enemy_c {
|
||||
public:
|
||||
u8 getModelNo() { return mModelNo;}
|
||||
s16 getFrizadRollAngle() { return mRollAngle;}
|
||||
f32 getModeRarius() { return mModeRarius;}
|
||||
u8 getFrizadAttack() { return mFrizadAttack;}
|
||||
|
||||
private:
|
||||
/* 0x5AC */ u8 field_0x5ac[0xF54 - 0x5AC];
|
||||
/* 0xF54 */ f32 mModeRarius;
|
||||
/* 0xF58 */ u8 field_0xf58[0xF5C - 0xF58];
|
||||
/* 0xF5C */ s16 mRollAngle;
|
||||
/* 0xF5E */ u8 field_0xf5e[0xFA8 - 0xF5E];
|
||||
/* 0xFA8 */ u8 mModelNo;
|
||||
/* 0xFA9 */ u8 field_0xfa9[0xFAD - 0xFA9];
|
||||
/* 0xFAD */ u8 mFrizadAttack;
|
||||
};
|
||||
|
||||
#endif /* D_A_E_FZ_H */
|
||||
|
|
|
|||
|
|
@ -4,399 +4,9 @@
|
|||
//
|
||||
|
||||
#include "rel/d/a/b/d_a_b_yo/d_a_b_yo.h"
|
||||
#include "rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h"
|
||||
#include "dol2asm.h"
|
||||
|
||||
//
|
||||
// Types:
|
||||
//
|
||||
|
||||
struct request_of_phase_process_class {};
|
||||
|
||||
struct csXyz {
|
||||
/* 802673F4 */ csXyz(s16, s16, s16);
|
||||
};
|
||||
|
||||
struct Vec {};
|
||||
|
||||
struct cXyz {
|
||||
/* 80266B84 */ void operator*(f32) const;
|
||||
/* 8062FB90 */ ~cXyz();
|
||||
/* 80639578 */ cXyz();
|
||||
/* 806396CC */ void abs(Vec const&) const;
|
||||
};
|
||||
|
||||
struct obj_ystone_class {
|
||||
/* 80639694 */ void setShapeAngle(csXyz);
|
||||
/* 806396B0 */ void setCurrentPos(cXyz);
|
||||
};
|
||||
|
||||
struct mDoMtx_stack_c {
|
||||
/* 8000CD64 */ void transS(cXyz const&);
|
||||
/* 8000CD9C */ void transM(f32, f32, f32);
|
||||
/* 8000CE38 */ void scaleM(f32, f32, f32);
|
||||
/* 8000CF44 */ void ZXYrotM(csXyz const&);
|
||||
|
||||
static u8 now[48];
|
||||
};
|
||||
|
||||
struct mDoGph_gInf_c {
|
||||
/* 80008078 */ void onBlure();
|
||||
};
|
||||
|
||||
struct J3DAnmTextureSRTKey {};
|
||||
|
||||
struct J3DAnmTexPattern {};
|
||||
|
||||
struct J3DAnmTevRegKey {};
|
||||
|
||||
struct J3DMaterialTable {
|
||||
/* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*);
|
||||
/* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*);
|
||||
/* 8032F880 */ void removeTevRegAnimator(J3DAnmTevRegKey*);
|
||||
};
|
||||
|
||||
struct mDoExt_btpAnm {
|
||||
/* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16);
|
||||
/* 8000D5E8 */ void entry(J3DMaterialTable*, s16);
|
||||
};
|
||||
|
||||
struct mDoExt_btkAnm {
|
||||
/* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16);
|
||||
/* 8000D6D8 */ void entry(J3DMaterialTable*, f32);
|
||||
};
|
||||
|
||||
struct mDoExt_brkAnm {
|
||||
/* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
|
||||
/* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
|
||||
};
|
||||
|
||||
struct mDoExt_baseAnm {
|
||||
/* 8000D428 */ void play();
|
||||
};
|
||||
|
||||
struct mDoExt_McaMorfCallBack2_c {};
|
||||
|
||||
struct mDoExt_McaMorfCallBack1_c {};
|
||||
|
||||
struct J3DAnmTransform {};
|
||||
|
||||
struct J3DModelData {};
|
||||
|
||||
struct Z2Creature {};
|
||||
|
||||
struct mDoExt_McaMorfSO {
|
||||
/* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
|
||||
mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,
|
||||
int, Z2Creature*, u32, u32);
|
||||
/* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32);
|
||||
/* 800110B0 */ void play(u32, s8);
|
||||
/* 800111C0 */ void entryDL();
|
||||
/* 800111EC */ void modelCalc();
|
||||
};
|
||||
|
||||
struct fopAc_ac_c {
|
||||
/* 80018B64 */ fopAc_ac_c();
|
||||
};
|
||||
|
||||
struct J3DModel {};
|
||||
|
||||
struct daMirror_c {
|
||||
/* 8003194C */ void entry(J3DModel*);
|
||||
/* 80031990 */ void remove();
|
||||
};
|
||||
|
||||
struct daE_FZ_c {
|
||||
/* 806C0B20 */ void demoDelete();
|
||||
};
|
||||
|
||||
struct daB_YO_c {
|
||||
/* 8062F51C */ void draw();
|
||||
/* 8062FBEC */ void onIceBreak(u16);
|
||||
/* 8062FC08 */ void setBck(int, u8, f32, f32);
|
||||
/* 8062FE0C */ void setActionMode(int, int);
|
||||
/* 8062FE18 */ void damage_check();
|
||||
/* 806300F4 */ void setBreakFrizad();
|
||||
/* 8063022C */ void setIcicleOperate(int);
|
||||
/* 806302B4 */ void setIcicleSubNumber();
|
||||
/* 80630330 */ void setWindowBreakEffect(int);
|
||||
/* 8063040C */ void setHensinEffect();
|
||||
/* 806305B8 */ void setLandingEffect(f32);
|
||||
/* 806306F0 */ void setBreakIceEffect();
|
||||
/* 8063089C */ void setWallHitEffect();
|
||||
/* 80630A9C */ void setChillEffect();
|
||||
/* 80630BF0 */ void setApperEffect();
|
||||
/* 80630CA0 */ void setApperEffect2();
|
||||
/* 80630DD8 */ void demo_skip(int);
|
||||
/* 80630E3C */ void DemoSkipCallBack(void*, int);
|
||||
/* 80630E70 */ void setYoMessage(int);
|
||||
/* 80630EAC */ void doYoMessage();
|
||||
/* 80630F28 */ void executeOpening();
|
||||
/* 80632598 */ void reflectFreeMove();
|
||||
/* 80632660 */ void calcFreeMove(f32);
|
||||
/* 8063290C */ void setReflectAngle();
|
||||
/* 806329CC */ void executeChase();
|
||||
/* 806331CC */ void executeSeriousDemo();
|
||||
/* 80633EDC */ void checkIcecleRevival();
|
||||
/* 80633F50 */ void createIcecleRevival(u8);
|
||||
/* 80634040 */ void executeJump();
|
||||
/* 80634548 */ void executeAttackIce();
|
||||
/* 8063476C */ void executeAttackYose();
|
||||
/* 80634CEC */ void checkDamageWithIceBreak();
|
||||
/* 80634E04 */ void executeAttackBody();
|
||||
/* 806352C8 */ void executeDemoRevival();
|
||||
/* 80635798 */ void executeDamage();
|
||||
/* 80635ABC */ void executeDeath();
|
||||
/* 80636E9C */ void reviseIceCenterPos(cXyz*);
|
||||
/* 80637048 */ void calcPlayerBufPos();
|
||||
/* 806374BC */ void action();
|
||||
/* 80637990 */ void mtx_set();
|
||||
/* 80637B30 */ void cc_set();
|
||||
/* 80637E10 */ void execute();
|
||||
/* 80637FC8 */ void _delete();
|
||||
/* 806380F8 */ void CreateHeap();
|
||||
/* 806388A0 */ void CreateHeap2();
|
||||
/* 806389C0 */ void create();
|
||||
};
|
||||
|
||||
struct daB_YO_HIO_c {
|
||||
/* 8062F46C */ daB_YO_HIO_c();
|
||||
/* 806395E4 */ ~daB_YO_HIO_c();
|
||||
};
|
||||
|
||||
struct daB_YOI_c {
|
||||
/* 8063A480 */ void setOperate(int);
|
||||
};
|
||||
|
||||
struct dVibration_c {
|
||||
/* 8006FA24 */ void StartShock(int, int, cXyz);
|
||||
/* 8006FB10 */ void StartQuake(int, int, cXyz);
|
||||
/* 8006FD94 */ void StopQuake(int);
|
||||
};
|
||||
|
||||
struct dSv_memBit_c {
|
||||
/* 80034918 */ void onDungeonItem(int);
|
||||
/* 80034934 */ void isDungeonItem(int) const;
|
||||
};
|
||||
|
||||
struct dSv_info_c {
|
||||
/* 80035200 */ void onSwitch(int, int);
|
||||
/* 80035360 */ void isSwitch(int, int) const;
|
||||
};
|
||||
|
||||
struct dSv_danBit_c {
|
||||
/* 80034B98 */ void onSwitch(int);
|
||||
/* 80034BC0 */ void offSwitch(int);
|
||||
/* 80034BE8 */ void isSwitch(int) const;
|
||||
};
|
||||
|
||||
struct dKy_tevstr_c {};
|
||||
|
||||
struct dScnKy_env_light_c {
|
||||
/* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
|
||||
/* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
|
||||
};
|
||||
|
||||
struct dRes_info_c {};
|
||||
|
||||
struct dRes_control_c {
|
||||
/* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
|
||||
};
|
||||
|
||||
struct dPa_levelEcallBack {};
|
||||
|
||||
struct _GXColor {};
|
||||
|
||||
struct dPa_control_c {
|
||||
struct level_c {
|
||||
/* 8004B918 */ void getEmitter(u32);
|
||||
};
|
||||
|
||||
/* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
|
||||
u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
|
||||
cXyz const*, f32);
|
||||
/* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
|
||||
cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
|
||||
_GXColor const*, cXyz const*, f32);
|
||||
};
|
||||
|
||||
struct dEvt_control_c {
|
||||
/* 80042468 */ void reset();
|
||||
/* 80042914 */ void setSkipProc(void*, int (*)(void*, int), int);
|
||||
/* 800429A8 */ void onSkipFade();
|
||||
/* 8004368C */ void setPtT(void*);
|
||||
};
|
||||
|
||||
struct dEvent_manager_c {
|
||||
/* 800483E8 */ void getRunEventName();
|
||||
};
|
||||
|
||||
struct dDlst_shadowControl_c {
|
||||
static u8 mSimpleTexObj[32];
|
||||
};
|
||||
|
||||
struct dCcU_AtInfo {};
|
||||
|
||||
struct dCcD_Stts {
|
||||
/* 80083860 */ void Init(int, int, fopAc_ac_c*);
|
||||
};
|
||||
|
||||
struct dCcD_SrcSph {};
|
||||
|
||||
struct dCcD_SrcCyl {};
|
||||
|
||||
struct dCcD_Sph {
|
||||
/* 80084A34 */ void Set(dCcD_SrcSph const&);
|
||||
/* 80639214 */ ~dCcD_Sph();
|
||||
/* 806392E0 */ dCcD_Sph();
|
||||
};
|
||||
|
||||
struct dCcD_GStts {
|
||||
/* 80083760 */ dCcD_GStts();
|
||||
/* 80083830 */ void Move();
|
||||
/* 8063943C */ ~dCcD_GStts();
|
||||
};
|
||||
|
||||
struct dCcD_GObjInf {
|
||||
/* 80083A28 */ dCcD_GObjInf();
|
||||
/* 800840E4 */ ~dCcD_GObjInf();
|
||||
/* 800842C0 */ void ChkAtHit();
|
||||
/* 80084358 */ void GetAtHitObj();
|
||||
/* 80084460 */ void ChkTgHit();
|
||||
/* 800844F8 */ void GetTgHitObj();
|
||||
};
|
||||
|
||||
struct dCcD_Cyl {
|
||||
/* 800848B4 */ void Set(dCcD_SrcCyl const&);
|
||||
};
|
||||
|
||||
struct dCamera_c {
|
||||
/* 801614AC */ void Start();
|
||||
/* 801614D0 */ void Stop();
|
||||
/* 8016300C */ void SetTrimSize(s32);
|
||||
/* 80180AE0 */ void Set(cXyz, cXyz, f32, s16);
|
||||
/* 80180C18 */ void Reset(cXyz, cXyz);
|
||||
/* 80181500 */ void GetForceLockOnActor();
|
||||
/* 80181534 */ void ForceLockOn(fopAc_ac_c*);
|
||||
/* 8018159C */ void ForceLockOff(fopAc_ac_c*);
|
||||
};
|
||||
|
||||
struct dBgW_Base {};
|
||||
|
||||
struct dBgW {
|
||||
/* 8007B970 */ dBgW();
|
||||
/* 8007B9C0 */ void Move();
|
||||
};
|
||||
|
||||
struct dBgS_PolyPassChk {
|
||||
/* 80078E68 */ void SetObj();
|
||||
};
|
||||
|
||||
struct dBgS_ObjAcch {
|
||||
/* 80639498 */ ~dBgS_ObjAcch();
|
||||
};
|
||||
|
||||
struct dBgS_AcchCir {
|
||||
/* 80075EAC */ dBgS_AcchCir();
|
||||
/* 80075F58 */ void SetWall(f32, f32);
|
||||
/* 80639508 */ ~dBgS_AcchCir();
|
||||
};
|
||||
|
||||
struct dBgS {
|
||||
/* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*);
|
||||
};
|
||||
|
||||
struct dBgS_Acch {
|
||||
/* 80075F94 */ ~dBgS_Acch();
|
||||
/* 800760A0 */ dBgS_Acch();
|
||||
/* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
|
||||
/* 80076AAC */ void CrrPos(dBgS&);
|
||||
};
|
||||
|
||||
struct cM3dGSph {
|
||||
/* 8026F648 */ void SetC(cXyz const&);
|
||||
/* 8026F708 */ void SetR(f32);
|
||||
/* 80639364 */ ~cM3dGSph();
|
||||
};
|
||||
|
||||
struct cM3dGCyl {
|
||||
/* 8026F1DC */ void SetC(cXyz const&);
|
||||
/* 8026F1F8 */ void SetH(f32);
|
||||
/* 8026F200 */ void SetR(f32);
|
||||
/* 806393AC */ ~cM3dGCyl();
|
||||
};
|
||||
|
||||
struct cM3dGCir {
|
||||
/* 8026EF18 */ ~cM3dGCir();
|
||||
};
|
||||
|
||||
struct cM3dGAab {
|
||||
/* 806393F4 */ ~cM3dGAab();
|
||||
};
|
||||
|
||||
struct cCcD_Obj {
|
||||
/* 80263A48 */ void GetAc();
|
||||
};
|
||||
|
||||
struct cCcS {
|
||||
/* 80264BA8 */ void Set(cCcD_Obj*);
|
||||
};
|
||||
|
||||
struct cCcD_GStts {
|
||||
/* 8063959C */ ~cCcD_GStts();
|
||||
};
|
||||
|
||||
struct cBgD_t {};
|
||||
|
||||
struct cBgW {
|
||||
/* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]);
|
||||
};
|
||||
|
||||
struct cBgS_PolyInfo {
|
||||
/* 802680B0 */ ~cBgS_PolyInfo();
|
||||
};
|
||||
|
||||
struct cBgS {
|
||||
/* 80074250 */ void Release(dBgW_Base*);
|
||||
};
|
||||
|
||||
struct _GXTexObj {};
|
||||
|
||||
struct Z2SeqMgr {
|
||||
/* 802AF010 */ void bgmStart(u32, u32, s32);
|
||||
/* 802AF408 */ void bgmStop(u32, s32);
|
||||
/* 802AF49C */ void subBgmStart(u32);
|
||||
/* 802AF884 */ void subBgmStop();
|
||||
/* 802AFB94 */ void bgmStreamPrepare(u32);
|
||||
/* 802AFE18 */ void bgmStreamPlay();
|
||||
/* 802AFF8C */ void changeBgmStatus(s32);
|
||||
};
|
||||
|
||||
struct JAISoundID {};
|
||||
|
||||
struct Z2SeMgr {
|
||||
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
|
||||
};
|
||||
|
||||
struct Z2CreatureEnemy {
|
||||
/* 802C0F64 */ Z2CreatureEnemy();
|
||||
/* 802C1094 */ void init(Vec*, Vec*, u8, u8);
|
||||
/* 802C1B90 */ void setEnemyName(char const*);
|
||||
};
|
||||
|
||||
struct Z2AudioMgr {
|
||||
static u8 mAudioMgrPtr[4 + 4 /* padding */];
|
||||
};
|
||||
|
||||
struct JMath {
|
||||
static u8 sincosTable_[65536];
|
||||
};
|
||||
|
||||
struct J3DFrameCtrl {
|
||||
/* 803283FC */ void init(s16);
|
||||
/* 8032842C */ void checkPass(f32);
|
||||
/* 80638838 */ ~J3DFrameCtrl();
|
||||
};
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
|
|
@ -631,10 +241,10 @@ extern "C" void checkPass__12J3DFrameCtrlFf();
|
|||
extern "C" void removeTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern();
|
||||
extern "C" void removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey();
|
||||
extern "C" void removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey();
|
||||
extern "C" void PSMTXCopy();
|
||||
extern "C" void PSMTXTrans();
|
||||
extern "C" void PSVECSquareMag();
|
||||
extern "C" void PSVECSquareDistance();
|
||||
// extern "C" void PSMTXCopy();
|
||||
// extern "C" void PSMTXTrans();
|
||||
// extern "C" void PSVECSquareMag();
|
||||
// extern "C" void PSVECSquareDistance();
|
||||
extern "C" void __construct_array();
|
||||
extern "C" void _savegpr_22();
|
||||
extern "C" void _savegpr_23();
|
||||
|
|
@ -652,10 +262,10 @@ extern "C" void _restgpr_26();
|
|||
extern "C" void _restgpr_27();
|
||||
extern "C" void _restgpr_28();
|
||||
extern "C" void _restgpr_29();
|
||||
extern "C" void abs();
|
||||
extern "C" void strcmp();
|
||||
extern "C" extern void* g_fopAc_Method[8];
|
||||
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
|
||||
// extern "C" void abs();
|
||||
// extern "C" void strcmp();
|
||||
// extern "C" extern void* g_fopAc_Method[8];
|
||||
// extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
|
||||
extern "C" extern void* __vt__8dCcD_Sph[36];
|
||||
extern "C" extern void* __vt__8dCcD_Cyl[36];
|
||||
extern "C" extern void* __vt__9dCcD_Stts[11];
|
||||
|
|
@ -666,11 +276,11 @@ extern "C" extern void* __vt__9cCcD_Stts[8];
|
|||
extern "C" u8 now__14mDoMtx_stack_c[48];
|
||||
extern "C" extern u8 g_dComIfG_gameInfo[122384];
|
||||
extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
|
||||
extern "C" extern u8 g_env_light[4880];
|
||||
extern "C" extern u8 j3dSys[284];
|
||||
// extern "C" extern u8 g_env_light[4880];
|
||||
// extern "C" extern u8 j3dSys[284];
|
||||
extern "C" extern u8 j3dZModeTable[96];
|
||||
extern "C" u8 sincosTable___5JMath[65536];
|
||||
extern "C" extern u32 __float_nan;
|
||||
// extern "C" extern u32 __float_nan;
|
||||
extern "C" extern u8 mBlureFlag__13mDoGph_gInf_c[4];
|
||||
extern "C" extern u8 struct_80450C98[4];
|
||||
extern "C" extern u8 pauseTimer__9dScnPly_c[4];
|
||||
|
|
@ -1220,7 +830,8 @@ asm void daB_YO_c::draw() {
|
|||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm cXyz::~cXyz() {
|
||||
// asm cXyz::~cXyz() {
|
||||
asm void __dt__4cXyzFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_yo/d_a_b_yo/__dt__4cXyzFv.s"
|
||||
}
|
||||
|
|
@ -2696,7 +2307,8 @@ asm void daB_YO_c::CreateHeap() {
|
|||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm J3DFrameCtrl::~J3DFrameCtrl() {
|
||||
// asm J3DFrameCtrl::~J3DFrameCtrl() {
|
||||
asm void __dt__12J3DFrameCtrlFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_yo/d_a_b_yo/__dt__12J3DFrameCtrlFv.s"
|
||||
}
|
||||
|
|
@ -2753,7 +2365,8 @@ asm void daB_YO_c::create() {
|
|||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm dCcD_Sph::~dCcD_Sph() {
|
||||
// asm dCcD_Sph::~dCcD_Sph() {
|
||||
asm void __dt__8dCcD_SphFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_yo/d_a_b_yo/__dt__8dCcD_SphFv.s"
|
||||
}
|
||||
|
|
@ -2763,7 +2376,8 @@ asm dCcD_Sph::~dCcD_Sph() {
|
|||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm dCcD_Sph::dCcD_Sph() {
|
||||
// asm dCcD_Sph::dCcD_Sph() {
|
||||
asm void __ct__8dCcD_SphFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_yo/d_a_b_yo/__ct__8dCcD_SphFv.s"
|
||||
}
|
||||
|
|
@ -2773,7 +2387,8 @@ asm dCcD_Sph::dCcD_Sph() {
|
|||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm cM3dGSph::~cM3dGSph() {
|
||||
// asm cM3dGSph::~cM3dGSph() {
|
||||
asm void __dt__8cM3dGSphFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_yo/d_a_b_yo/__dt__8cM3dGSphFv.s"
|
||||
}
|
||||
|
|
@ -2783,7 +2398,8 @@ asm cM3dGSph::~cM3dGSph() {
|
|||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm cM3dGCyl::~cM3dGCyl() {
|
||||
// asm cM3dGCyl::~cM3dGCyl() {
|
||||
asm void __dt__8cM3dGCylFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_yo/d_a_b_yo/__dt__8cM3dGCylFv.s"
|
||||
}
|
||||
|
|
@ -2793,7 +2409,8 @@ asm cM3dGCyl::~cM3dGCyl() {
|
|||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm cM3dGAab::~cM3dGAab() {
|
||||
// asm cM3dGAab::~cM3dGAab() {
|
||||
asm void __dt__8cM3dGAabFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_yo/d_a_b_yo/__dt__8cM3dGAabFv.s"
|
||||
}
|
||||
|
|
@ -2803,7 +2420,8 @@ asm cM3dGAab::~cM3dGAab() {
|
|||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm dCcD_GStts::~dCcD_GStts() {
|
||||
// asm dCcD_GStts::~dCcD_GStts() {
|
||||
asm void __dt__10dCcD_GSttsFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_yo/d_a_b_yo/__dt__10dCcD_GSttsFv.s"
|
||||
}
|
||||
|
|
@ -2813,7 +2431,8 @@ asm dCcD_GStts::~dCcD_GStts() {
|
|||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm dBgS_ObjAcch::~dBgS_ObjAcch() {
|
||||
// asm dBgS_ObjAcch::~dBgS_ObjAcch() {
|
||||
asm void __dt__12dBgS_ObjAcchFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_yo/d_a_b_yo/__dt__12dBgS_ObjAcchFv.s"
|
||||
}
|
||||
|
|
@ -2823,14 +2442,16 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() {
|
|||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm dBgS_AcchCir::~dBgS_AcchCir() {
|
||||
// asm dBgS_AcchCir::~dBgS_AcchCir() {
|
||||
asm void __dt__12dBgS_AcchCirFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_yo/d_a_b_yo/__dt__12dBgS_AcchCirFv.s"
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 80639578-8063957C 00A1F8 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */
|
||||
cXyz::cXyz() {
|
||||
// cXyz::cXyz() {
|
||||
asm void __ct__4cXyzFv() {
|
||||
/* empty function */
|
||||
}
|
||||
|
||||
|
|
@ -2848,7 +2469,8 @@ static asm void daB_YO_Create(daB_YO_c* param_0) {
|
|||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm cCcD_GStts::~cCcD_GStts() {
|
||||
// asm cCcD_GStts::~cCcD_GStts() {
|
||||
asm void __dt__10cCcD_GSttsFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_yo/d_a_b_yo/__dt__10cCcD_GSttsFv.s"
|
||||
}
|
||||
|
|
@ -2916,7 +2538,8 @@ static asm void func_8063968C() {
|
|||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void obj_ystone_class::setShapeAngle(csXyz param_0) {
|
||||
// asm void obj_ystone_class::setShapeAngle(csXyz param_0) {
|
||||
asm void setShapeAngle__16obj_ystone_classF5csXyz() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_yo/d_a_b_yo/setShapeAngle__16obj_ystone_classF5csXyz.s"
|
||||
}
|
||||
|
|
@ -2926,7 +2549,8 @@ asm void obj_ystone_class::setShapeAngle(csXyz param_0) {
|
|||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void obj_ystone_class::setCurrentPos(cXyz param_0) {
|
||||
// asm void obj_ystone_class::setCurrentPos(cXyz param_0) {
|
||||
asm void setCurrentPos__16obj_ystone_classF4cXyz() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_yo/d_a_b_yo/setCurrentPos__16obj_ystone_classF4cXyz.s"
|
||||
}
|
||||
|
|
@ -2936,7 +2560,8 @@ asm void obj_ystone_class::setCurrentPos(cXyz param_0) {
|
|||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void cXyz::abs(Vec const& param_0) const {
|
||||
// asm void cXyz::abs(Vec const& param_0) const {
|
||||
asm void abs__4cXyzCFRC3Vec() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/b/d_a_b_yo/d_a_b_yo/abs__4cXyzCFRC3Vec.s"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
* @brief Enemy - Mini Freezard
|
||||
*/
|
||||
|
||||
|
||||
|
||||
#include "rel/d/a/e/d_a_e_fz/d_a_e_fz.h"
|
||||
#include "rel/d/a/d_a_mirror/d_a_mirror.h"
|
||||
#include "d/com/d_com_inf_game.h"
|
||||
|
|
@ -17,6 +19,7 @@
|
|||
// Forward References:
|
||||
//
|
||||
|
||||
#ifndef d_a_e_fz_nonmatching
|
||||
extern "C" void __ct__12daE_FZ_HIO_cFv();
|
||||
extern "C" void draw__8daE_FZ_cFv();
|
||||
extern "C" static void daE_FZ_Draw__FP8daE_FZ_c();
|
||||
|
|
@ -63,6 +66,7 @@ extern "C" extern char const* const d_a_e_fz__stringBase0;
|
|||
// External References:
|
||||
//
|
||||
|
||||
|
||||
extern "C" void mDoMtx_YrotS__FPA4_fs();
|
||||
extern "C" void transM__14mDoMtx_stack_cFfff();
|
||||
extern "C" void scaleM__14mDoMtx_stack_cFfff();
|
||||
|
|
@ -184,6 +188,7 @@ extern "C" void __register_global_object();
|
|||
|
||||
/* ############################################################################################## */
|
||||
/* 806C1938-806C193C 000000 0004+00 13/13 0/0 0/0 .rodata @3803 */
|
||||
|
||||
SECTION_RODATA static f32 const lit_3803 = 100.0f;
|
||||
COMPILER_STRIP_GATE(0x806C1938, &lit_3803);
|
||||
|
||||
|
|
@ -332,6 +337,7 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = {
|
|||
0x00000000,
|
||||
};
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 806C1A20-806C1A28 000020 0008+00 0/1 0/0 0/0 .data e_prim$3682 */
|
||||
#pragma push
|
||||
|
|
@ -392,6 +398,7 @@ static dCcD_SrcSph cc_fz_at_src = {
|
|||
} // mSphAttr
|
||||
};
|
||||
|
||||
#ifndef d_a_e_fz_nonmatching
|
||||
/* 806C1AB8-806C1AD4 -00001 001C+00 1/1 0/0 0/0 .data @4324 */
|
||||
SECTION_DATA static void* lit_4324[7] = {
|
||||
(void*)(((char*)executeDamage__8daE_FZ_cFv) + 0x5C),
|
||||
|
|
@ -402,21 +409,29 @@ SECTION_DATA static void* lit_4324[7] = {
|
|||
(void*)(((char*)executeDamage__8daE_FZ_cFv) + 0x178),
|
||||
(void*)(((char*)executeDamage__8daE_FZ_cFv) + 0x3F4),
|
||||
};
|
||||
#endif
|
||||
|
||||
/* 806C1AD4-806C1ADC 0000D4 0006+02 1/1 0/0 0/0 .data ice_name$4578 */
|
||||
SECTION_DATA static u16 ice_name[3] = {
|
||||
static u16 ice_name[3] = {
|
||||
0x8221,
|
||||
0x8222,
|
||||
0x8223,
|
||||
};
|
||||
|
||||
/* 806C1ADC-806C1AFC -00001 0020+00 1/0 0/0 0/0 .data l_daE_FZ_Method */
|
||||
// forward references
|
||||
static void daE_FZ_Create(daE_FZ_c* i_this);
|
||||
static void daE_FZ_Delete(daE_FZ_c* i_this);
|
||||
static void daE_FZ_Execute(daE_FZ_c* i_this);
|
||||
static bool daE_FZ_IsDelete(daE_FZ_c* i_this);
|
||||
static void daE_FZ_Draw(daE_FZ_c* i_this);
|
||||
|
||||
static actor_method_class l_daE_FZ_Method = {
|
||||
(process_method_func)daE_FZ_Create__FP8daE_FZ_c,
|
||||
(process_method_func)daE_FZ_Delete__FP8daE_FZ_c,
|
||||
(process_method_func)daE_FZ_Execute__FP8daE_FZ_c,
|
||||
(process_method_func)daE_FZ_IsDelete__FP8daE_FZ_c,
|
||||
(process_method_func)daE_FZ_Draw__FP8daE_FZ_c,
|
||||
(process_method_func)daE_FZ_Create,
|
||||
(process_method_func)daE_FZ_Delete,
|
||||
(process_method_func)daE_FZ_Execute,
|
||||
(process_method_func)daE_FZ_IsDelete,
|
||||
(process_method_func)daE_FZ_Draw,
|
||||
};
|
||||
|
||||
/* 806C1AFC-806C1B2C -00001 0030+00 0/0 0/0 1/0 .data g_profile_E_FZ */
|
||||
|
|
@ -437,6 +452,7 @@ extern actor_process_profile_definition g_profile_E_FZ = {
|
|||
fopAc_CULLBOX_0_e, // cullType
|
||||
};
|
||||
|
||||
#ifndef d_a_e_fz_nonmatching
|
||||
/* 806C1B2C-806C1B38 00012C 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */
|
||||
SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = {
|
||||
(void*)NULL /* RTTI */,
|
||||
|
|
@ -491,6 +507,7 @@ SECTION_DATA extern void* __vt__12daE_FZ_HIO_c[3] = {
|
|||
(void*)NULL,
|
||||
(void*)__dt__12daE_FZ_HIO_cFv,
|
||||
};
|
||||
#endif
|
||||
|
||||
/* 806BE94C-806BE9D4 0000EC 0088+00 1/1 0/0 0/0 .text __ct__12daE_FZ_HIO_cFv */
|
||||
#ifdef NONMATCHING
|
||||
|
|
@ -524,17 +541,19 @@ asm daE_FZ_HIO_c::daE_FZ_HIO_c() {
|
|||
|
||||
/* ############################################################################################## */
|
||||
/* 806C1990-806C1994 000058 0004+00 0/3 0/0 0/0 .rodata @3863 */
|
||||
#ifndef d_a_e_fz_nonmatching
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3863 = 300.0f;
|
||||
COMPILER_STRIP_GATE(0x806C1990, &lit_3863);
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 806BE9D4-806BEAD8 000174 0104+00 1/1 0/0 0/0 .text draw__8daE_FZ_cFv */
|
||||
#ifdef NONMATCHING
|
||||
// float literals
|
||||
s32 daE_FZ_c::draw() {
|
||||
if (field_0x714 != 2 || !checkItemGet(IRONBALL,1)) {
|
||||
if (field_0x714 == 2 && !checkItemGet(IRONBALL,1)) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -616,12 +635,12 @@ void daE_FZ_c::deadnextSet(bool param_0) {
|
|||
mCreature.startCollisionSE(Z2SE_HIT_HAMMER, 0x20);
|
||||
}
|
||||
|
||||
mSph1.ClrTgHit();
|
||||
mTgCoSph.ClrTgHit();
|
||||
fopAcM_OffStatus(this,0);
|
||||
attention_info.flags &= 0xfffffffb;
|
||||
|
||||
mSph2.OffAtSetBit();
|
||||
mSph1.OffTgSetBit();
|
||||
mAtSph.OffAtSetBit();
|
||||
mTgCoSph.OffTgSetBit();
|
||||
|
||||
mCreature.startCreatureSound(Z2SE_EN_FZ_DEATH, 0, -1);
|
||||
|
||||
|
|
@ -642,8 +661,10 @@ asm void daE_FZ_c::deadnextSet(bool param_0) {
|
|||
|
||||
/* ############################################################################################## */
|
||||
/* 806C1994-806C1998 00005C 0004+00 1/3 0/0 0/0 .rodata @4109 */
|
||||
#ifndef d_a_e_fz_nonmatching
|
||||
SECTION_RODATA static f32 const lit_4109 = 1.0f / 5.0f;
|
||||
COMPILER_STRIP_GATE(0x806C1994, &lit_4109);
|
||||
#endif
|
||||
|
||||
/* 806C1BA0-806C1BA4 000008 0004+00 2/2 0/0 0/0 .bss None */
|
||||
static u8 data_806C1BA0[4];
|
||||
|
|
@ -652,7 +673,11 @@ static u8 data_806C1BA0[4];
|
|||
static u8 lit_3819[12];
|
||||
|
||||
/* 806C1BB0-806C1BE8 000018 0038+00 8/8 0/0 0/0 .bss l_HIO */
|
||||
#ifndef d_a_e_fz_nonmatching
|
||||
static daE_FZ_HIO_c_tmp l_HIO;
|
||||
#else
|
||||
static daE_FZ_HIO_c l_HIO;
|
||||
#endif
|
||||
|
||||
/* 806BED34-806BF444 0004D4 0710+00 1/1 0/0 0/0 .text damage_check__8daE_FZ_cFv */
|
||||
#ifdef NONMATCHING
|
||||
|
|
@ -676,18 +701,18 @@ void daE_FZ_c::damage_check() {
|
|||
mStts.Move();
|
||||
|
||||
if (field_0x714 == 3) {
|
||||
if (mSph1.ChkTgHit()) {
|
||||
mAtInfo.mpCollider = mSph1.GetTgHitObj();
|
||||
if (mTgCoSph.ChkTgHit()) {
|
||||
mAtInfo.mpCollider = mTgCoSph.GetTgHitObj();
|
||||
|
||||
if (mSph1.GetTgHitObj()->ChkAtType(AT_TYPE_IRON_BALL)) {
|
||||
if (mTgCoSph.GetTgHitObj()->ChkAtType(AT_TYPE_IRON_BALL)) {
|
||||
deadnextSet(false);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (mSph1.ChkTgHit()) {
|
||||
mAtInfo.mpCollider = mSph1.GetTgHitObj();
|
||||
if (mTgCoSph.ChkTgHit()) {
|
||||
mAtInfo.mpCollider = mTgCoSph.GetTgHitObj();
|
||||
|
||||
if (mSph1.GetTgHitObj()->ChkAtType(AT_TYPE_40) || mSph1.GetTgHitObj()->ChkAtType(AT_TYPE_BOOMERANG)) {
|
||||
if (mTgCoSph.GetTgHitObj()->ChkAtType(AT_TYPE_40) || mTgCoSph.GetTgHitObj()->ChkAtType(AT_TYPE_BOOMERANG)) {
|
||||
current.angle.y = fopAcM_searchPlayerAngleY(this) + 32768;
|
||||
f32 tmp_l_hio = l_HIO.field_0x28;
|
||||
speedF = tmp_l_hio;
|
||||
|
|
@ -697,14 +722,14 @@ void daE_FZ_c::damage_check() {
|
|||
return;
|
||||
}
|
||||
|
||||
pos2 = current.pos - *mSph1.GetTgHitPosP();
|
||||
pos3.set(*mSph1.GetTgHitPosP());
|
||||
pos2 = current.pos - *mTgCoSph.GetTgHitPosP();
|
||||
pos3.set(*mTgCoSph.GetTgHitPosP());
|
||||
|
||||
s_pos.x = 0;
|
||||
s_pos.y = pos2.atan2sX_Z();
|
||||
s_pos.z = 0;
|
||||
|
||||
if (mSph1.GetTgHitObj()->ChkAtType(AT_TYPE_SPINNER) || mSph1.GetTgHitObj()->ChkAtType(AT_TYPE_ARROW)) {
|
||||
if (mTgCoSph.GetTgHitObj()->ChkAtType(AT_TYPE_SPINNER) || mTgCoSph.GetTgHitObj()->ChkAtType(AT_TYPE_ARROW)) {
|
||||
current.angle.y = fopAcM_searchPlayerAngleY(this) + 32768;
|
||||
f32 tmp_l_hio = l_HIO.field_0x28;
|
||||
speedF = tmp_l_hio;
|
||||
|
|
@ -718,7 +743,7 @@ void daE_FZ_c::damage_check() {
|
|||
cXyz cStack_54(l_HIO.field_0x0c, l_HIO.field_0x0c, l_HIO.field_0x0c);
|
||||
dComIfGp_particle_set(0x85ba, ¤t.pos, &shape_angle, &cStack_54);
|
||||
|
||||
if (mSph1.GetTgHitObj()->ChkAtType(AT_TYPE_HOOKSHOT)) {
|
||||
if (mTgCoSph.GetTgHitObj()->ChkAtType(AT_TYPE_HOOKSHOT)) {
|
||||
health -= 20;
|
||||
|
||||
if (1 < health) {
|
||||
|
|
@ -742,9 +767,9 @@ void daE_FZ_c::damage_check() {
|
|||
return;
|
||||
}
|
||||
|
||||
if (mSph1.GetTgHitObj()->ChkAtType(AT_TYPE_IRON_BALL)) {
|
||||
if (mTgCoSph.GetTgHitObj()->ChkAtType(AT_TYPE_IRON_BALL)) {
|
||||
deadnextSet(false);
|
||||
mSph1.ClrTgHit();
|
||||
mTgCoSph.ClrTgHit();
|
||||
dComIfGp_setHitMark(3,this,&pos3,&s_pos,0,AT_TYPE_0);
|
||||
return;
|
||||
}
|
||||
|
|
@ -774,12 +799,12 @@ void daE_FZ_c::damage_check() {
|
|||
deadnextSet(true);
|
||||
return;
|
||||
} else {
|
||||
if (mObjAcch.ChkGroundHit() && mSph1.ChkCoHit()) {
|
||||
fopAc_ac_c* co_hit_actor = mSph1.GetCoHitAc();
|
||||
if (mObjAcch.ChkGroundHit() && mTgCoSph.ChkCoHit()) {
|
||||
fopAc_ac_c* co_hit_actor = mTgCoSph.GetCoHitAc();
|
||||
|
||||
if (fopAcM_IsActor(co_hit_actor) && fopAcM_GetName(co_hit_actor) == PROC_E_FZ) {
|
||||
pos = current.pos - mSph1.GetCoHitAc()->current.pos;
|
||||
mSph1.ClrCoHit();
|
||||
pos = current.pos - mTgCoSph.GetCoHitAc()->current.pos;
|
||||
mTgCoSph.ClrCoHit();
|
||||
f32 co_hit_actor_speed = co_hit_actor->speedF;
|
||||
|
||||
if (co_hit_actor_speed > l_HIO.field_0x28 * 0.2f || speedF > l_HIO.field_0x28 * 0.2f) {
|
||||
|
|
@ -805,16 +830,16 @@ void daE_FZ_c::damage_check() {
|
|||
}
|
||||
}
|
||||
|
||||
if (mSph2.ChkAtHit()) {
|
||||
if (mAtSph.ChkAtHit()) {
|
||||
fopAc_ac_c* player = dComIfGp_getPlayer(0);
|
||||
fopAc_ac_c* at_hit_actor = mSph2.GetAtHitAc();
|
||||
fopAc_ac_c* at_hit_actor = mAtSph.GetAtHitAc();
|
||||
|
||||
current.angle.y = fopAcM_searchPlayerAngleY(this) + 32768;
|
||||
|
||||
if (player != at_hit_actor) {
|
||||
mSph2.ClrAtHit();
|
||||
mAtSph.ClrAtHit();
|
||||
} else {
|
||||
if (mSph2.ChkAtShieldHit()) {
|
||||
if (mAtSph.ChkAtShieldHit()) {
|
||||
f32 l_hio_28 = l_HIO.field_0x28;
|
||||
speedF = l_hio_28;
|
||||
field_0x6fc = l_hio_28;
|
||||
|
|
@ -827,7 +852,7 @@ void daE_FZ_c::damage_check() {
|
|||
}
|
||||
}
|
||||
mBoundSoundset();
|
||||
mSph2.ClrAtHit();
|
||||
mAtSph.ClrAtHit();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -848,6 +873,7 @@ asm void daE_FZ_c::damage_check() {
|
|||
|
||||
/* ############################################################################################## */
|
||||
/* 806C1998-806C199C 000060 0004+00 0/3 0/0 0/0 .rodata @4139 */
|
||||
#ifndef d_a_e_fz_nonmatching
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_4139 = 70.0f;
|
||||
|
|
@ -860,6 +886,7 @@ COMPILER_STRIP_GATE(0x806C1998, &lit_4139);
|
|||
SECTION_RODATA static f32 const lit_4140 = -1000000000.0f;
|
||||
COMPILER_STRIP_GATE(0x806C199C, &lit_4140);
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 806BF444-806BF58C 000BE4 0148+00 3/3 0/0 0/0 .text way_gake_check__8daE_FZ_cFv */
|
||||
#ifdef NONMATCHING
|
||||
|
|
@ -909,6 +936,7 @@ asm bool daE_FZ_c::way_gake_check() {
|
|||
|
||||
/* ############################################################################################## */
|
||||
/* 806C19A0-806C19A4 000068 0004+00 0/3 0/0 0/0 .rodata @4200 */
|
||||
#ifndef d_a_e_fz_nonmatching
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_4200 = 200.0f;
|
||||
|
|
@ -944,6 +972,7 @@ SECTION_RODATA static u8 const lit_4205[8] = {
|
|||
};
|
||||
COMPILER_STRIP_GATE(0x806C19B0, &lit_4205);
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 806BF58C-806BF8E8 000D2C 035C+00 1/1 0/0 0/0 .text executeWait__8daE_FZ_cFv */
|
||||
#ifdef NONMATCHING
|
||||
|
|
@ -964,7 +993,7 @@ void daE_FZ_c::executeWait() {
|
|||
pos2.y = home.pos.y;
|
||||
pos2.z = home.pos.z + cM_rndFX(l_HIO.field_0x10);
|
||||
|
||||
pos = pos2 - current.pos; // -= doesn't appear to work here
|
||||
pos = pos2 - current.pos;
|
||||
|
||||
angle = pos.atan2sX_Z() - current.angle.y;
|
||||
|
||||
|
|
@ -1078,11 +1107,13 @@ asm void daE_FZ_c::executeMove() {
|
|||
|
||||
/* ############################################################################################## */
|
||||
/* 806C19B8-806C19BC 000080 0004+00 0/1 0/0 0/0 .rodata @4243 */
|
||||
#ifndef d_a_e_fz_nonmatching
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_4243 = 7.0f / 10.0f;
|
||||
COMPILER_STRIP_GATE(0x806C19B8, &lit_4243);
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 806BFA64-806BFB60 001204 00FC+00 1/1 0/0 0/0 .text executeAttack__8daE_FZ_cFv */
|
||||
#ifdef NONMATCHING
|
||||
|
|
@ -1233,6 +1264,7 @@ asm void daE_FZ_c::executeDamage() {
|
|||
|
||||
/* ############################################################################################## */
|
||||
/* 806C19BC-806C19C0 000084 0004+00 0/0 0/0 0/0 .rodata @4322 */
|
||||
#ifndef d_a_e_fz_nonmatching
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_4322 = 4096.0f;
|
||||
|
|
@ -1266,6 +1298,7 @@ COMPILER_STRIP_GATE(0x806C19C8, &lit_4420);
|
|||
SECTION_RODATA static f32 const lit_4421 = 60.0f;
|
||||
COMPILER_STRIP_GATE(0x806C19CC, &lit_4421);
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 806BFF94-806C0224 001734 0290+00 1/1 0/0 0/0 .text executeRollMove__8daE_FZ_cFv */
|
||||
#ifdef NONMATCHING
|
||||
|
|
@ -1325,8 +1358,8 @@ void daE_FZ_c::executeRollMove() {
|
|||
return;
|
||||
}
|
||||
|
||||
if (mSph2.ChkAtHit()) {
|
||||
if ((fopAcM_GetName(mSph2.GetAtHitAc()) == PROC_ALINK) || mSph2.ChkAtShieldHit()) {
|
||||
if (mAtSph.ChkAtHit()) {
|
||||
if ((fopAcM_GetName(mAtSph.GetAtHitAc()) == PROC_ALINK) || mAtSph.ChkAtShieldHit()) {
|
||||
setActionMode(ACT_DAMAGE,0);
|
||||
return;
|
||||
}
|
||||
|
|
@ -1348,11 +1381,13 @@ asm void daE_FZ_c::executeRollMove() {
|
|||
|
||||
/* ############################################################################################## */
|
||||
/* 806C19D0-806C19D4 000098 0004+00 0/2 0/0 0/0 .rodata @4517 */
|
||||
#ifndef d_a_e_fz_nonmatching
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_4517 = 35.0f;
|
||||
COMPILER_STRIP_GATE(0x806C19D0, &lit_4517);
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 806C0224-806C06DC 0019C4 04B8+00 1/1 0/0 0/0 .text action__8daE_FZ_cFv */
|
||||
#ifdef NONMATCHING
|
||||
|
|
@ -1500,11 +1535,13 @@ void daE_FZ_c::mtx_set() {
|
|||
|
||||
/* ############################################################################################## */
|
||||
/* 806C19D4-806C19D8 00009C 0004+00 0/1 0/0 0/0 .rodata @4562 */
|
||||
#ifndef d_a_e_fz_nonmatching
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_4562 = 25.0f;
|
||||
COMPILER_STRIP_GATE(0x806C19D4, &lit_4562);
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 806C0760-806C08C4 001F00 0164+00 1/1 0/0 0/0 .text cc_set__8daE_FZ_cFv */
|
||||
#ifdef NONMATCHING
|
||||
|
|
@ -1514,29 +1551,29 @@ void daE_FZ_c::cc_set() {
|
|||
cXyz pos2;
|
||||
|
||||
pos.set(0.0f,60.0f,0.0f);
|
||||
mDoMtx_stack_c::multVec(&pos,&mEyePos);
|
||||
attention_info.mPosition = mEyePos;
|
||||
attention_info.mPosition.y += 25.0f;
|
||||
mDoMtx_stack_c::multVec(&pos,&eyePos);
|
||||
attention_info.position = eyePos;
|
||||
attention_info.position.y += 25.0f;
|
||||
|
||||
mDoMtx_stack_c::copy(mpModel->getBaseTRMtx());
|
||||
|
||||
pos.set(0.0f,40.0f,0.0f);
|
||||
mDoMtx_stack_c::multVec(&pos,&pos2);
|
||||
|
||||
mSph1.SetC(pos2);
|
||||
mSph1.SetR(mRadiusBase * 60.0f);
|
||||
mTgCoSph.SetC(pos2);
|
||||
mTgCoSph.SetR(mRadiusBase * 60.0f);
|
||||
|
||||
dComIfG_Ccsp()->Set(&mSph1);
|
||||
dComIfG_Ccsp()->Set(&mTgCoSph);
|
||||
|
||||
mDoMtx_stack_c::copy(mpModel->getBaseTRMtx());
|
||||
|
||||
pos.set(0.0f,25.0f,0.0f);
|
||||
mDoMtx_stack_c::multVec(&pos,&pos2);
|
||||
|
||||
mSph2.SetC(pos2);
|
||||
mSph2.SetR(mRadiusBase * 40.0f);
|
||||
mAtSph.SetC(pos2);
|
||||
mAtSph.SetR(mRadiusBase * 0.05f);
|
||||
|
||||
dComIfG_Ccsp()->Set(&mSph2);
|
||||
dComIfG_Ccsp()->Set(&mAtSph);
|
||||
}
|
||||
#else
|
||||
#pragma push
|
||||
|
|
@ -1551,11 +1588,13 @@ asm void daE_FZ_c::cc_set() {
|
|||
|
||||
/* ############################################################################################## */
|
||||
/* 806C19D8-806C19DC 0000A0 0004+00 0/1 0/0 0/0 .rodata @4627 */
|
||||
#ifndef d_a_e_fz_nonmatching
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_4627 = 4.0f / 5.0f;
|
||||
COMPILER_STRIP_GATE(0x806C19D8, &lit_4627);
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 806C08C4-806C0B00 002064 023C+00 1/1 0/0 0/0 .text execute__8daE_FZ_cFv */
|
||||
#ifdef NONMATCHING
|
||||
|
|
@ -1585,25 +1624,25 @@ s32 daE_FZ_c::execute() {
|
|||
if (field_0x712 != 0)
|
||||
field_0x712 -= 1;
|
||||
|
||||
action();
|
||||
mtx_set();
|
||||
cc_set();
|
||||
action(); // set current action
|
||||
mtx_set(); // update model matrix
|
||||
cc_set(); // update sphere colliders
|
||||
|
||||
mCreature.framework(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
|
||||
|
||||
field_0x664 = current.pos - next.pos;
|
||||
field_0x664 *= 8000.0f;
|
||||
mUserWork = current.pos - home.pos;
|
||||
mUserWork *= 8000.0f;
|
||||
|
||||
for (int i = 0; i < 3; i++) {
|
||||
field_0x71c[i] = dComIfGp_particle_set(field_0x71c[i], ice_name[i], ¤t.pos, 0, 0);
|
||||
JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(field_0x71c[i]);
|
||||
mParticleSet[i] = dComIfGp_particle_set(mParticleSet[i], ice_name[i], ¤t.pos, 0, 0);
|
||||
JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(mParticleSet[i]);
|
||||
|
||||
if (emitter) {
|
||||
mDoMtx_stack_c::copy(field_0x5b4->getBaseTRMtx());
|
||||
mDoMtx_stack_c::copy(mpModel->getBaseTRMtx());
|
||||
mDoMtx_stack_c::transM(0.0f, 40.0f, 0.0f);
|
||||
emitter->setGlobalSRTMatrix(mDoMtx_stack_c::get());
|
||||
emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB());
|
||||
emitter->setUserWork((u32)(&field_0x664));
|
||||
emitter->setUserWork((u32)(&mUserWork));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1628,7 +1667,7 @@ static void daE_FZ_Execute(daE_FZ_c* i_this) {
|
|||
/* 806C0B20-806C0B8C 0022C0 006C+00 0/0 0/0 1/1 .text demoDelete__8daE_FZ_cFv */
|
||||
void daE_FZ_c::demoDelete() {
|
||||
for (int i = 0; i < 3; i++) {
|
||||
dComIfGp_particle_levelEmitterOnEventMove(field_0x71c[i]);
|
||||
dComIfGp_particle_levelEmitterOnEventMove(mParticleSet[i]);
|
||||
}
|
||||
|
||||
fopAcM_delete(this);
|
||||
|
|
@ -1685,6 +1724,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
|
|||
|
||||
/* ############################################################################################## */
|
||||
/* 806C19DC-806C19E0 0000A4 0004+00 0/1 0/0 0/0 .rodata @4847 */
|
||||
#ifndef d_a_e_fz_nonmatching
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_4847 = -200.0f;
|
||||
|
|
@ -1731,6 +1771,7 @@ COMPILER_STRIP_GATE(0x806C19F0, &lit_4852);
|
|||
#pragma force_active on
|
||||
SECTION_DEAD static char const* const stringBase_806C19F9 = "E_fz";
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 806C0CD0-806C1208 002470 0538+00 1/1 0/0 0/0 .text create__8daE_FZ_cFv */
|
||||
#ifdef NONMATCHING
|
||||
|
|
@ -1776,7 +1817,7 @@ s32 daE_FZ_c::create() {
|
|||
}
|
||||
}
|
||||
|
||||
mObjAcch.Set(&fopAcM_GetPosition_p(this),&fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, &fopAcM_GetSpeed_p(this), 0, 0);
|
||||
mObjAcch.Set(fopAcM_GetPosition_p(this),fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), 0, 0);
|
||||
|
||||
if (field_0x714 == 3) {
|
||||
mAcchCir.SetWall(35.0f,70.0f);
|
||||
|
|
@ -1787,19 +1828,19 @@ s32 daE_FZ_c::create() {
|
|||
|
||||
mObjAcch.CrrPos(dComIfG_Bgsp());
|
||||
|
||||
mSph1.Set(cc_fz_src);
|
||||
mSph1.SetStts(&mStts);
|
||||
mTgCoSph.Set(cc_fz_src);
|
||||
mTgCoSph.SetStts(&mStts);
|
||||
|
||||
mSph2.Set(cc_fz_at_src);
|
||||
mSph2.SetStts(&mStts);
|
||||
mAtSph.Set(cc_fz_at_src);
|
||||
mAtSph.SetStts(&mStts);
|
||||
|
||||
mCreature.init(¤t.pos,&mEyePos,3,1);
|
||||
mCreature.init(¤t.pos,&eyePos,3,1);
|
||||
mCreature.setEnemyName("E_fz");
|
||||
|
||||
mAtInfo.mpSound = &mCreature;
|
||||
mAtInfo.mPowerType = 1;
|
||||
|
||||
mGravity = -5.0f;
|
||||
gravity = -5.0f;
|
||||
|
||||
shape_angle.z = 0;
|
||||
shape_angle.x = 0;
|
||||
|
|
@ -1824,11 +1865,11 @@ s32 daE_FZ_c::create() {
|
|||
if (field_0x714 == 3) {
|
||||
mRadiusBase = 0.0f;
|
||||
attention_info.flags &= 0xfffffffb;
|
||||
mSph2.SetAtType(AT_TYPE_CSTATUE_SWING);
|
||||
mSph2.SetAtSpl(dCcG_At_Spl_UNK_1);
|
||||
mAtSph.SetAtType(AT_TYPE_CSTATUE_SWING);
|
||||
mAtSph.SetAtSpl(dCcG_At_Spl_UNK_1);
|
||||
setActionMode(ACT_ROLLMOVE,0);
|
||||
} else {
|
||||
mSph2.SetAtMtrl(2);
|
||||
mAtSph.SetAtMtrl(2);
|
||||
mRadiusBase = 1.0f;
|
||||
cM_rnd() < 0.5f ? setActionMode(ACT_WAIT,0) : setActionMode(ACT_MOVE,0);
|
||||
}
|
||||
|
|
@ -1849,6 +1890,7 @@ asm s32 daE_FZ_c::create() {
|
|||
#pragma pop
|
||||
#endif
|
||||
|
||||
#ifndef d_a_e_fz_nonmatching
|
||||
/* 806C1208-806C1250 0029A8 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
|
|
@ -1909,12 +1951,14 @@ asm void __dt__12dBgS_AcchCirFv() {
|
|||
asm void __ct__4cXyzFv() {
|
||||
/* empty function */
|
||||
}
|
||||
#endif
|
||||
|
||||
/* 806C13D8-806C13F8 002B78 0020+00 1/0 0/0 0/0 .text daE_FZ_Create__FP8daE_FZ_c */
|
||||
static void daE_FZ_Create(daE_FZ_c* i_this) {
|
||||
i_this->create();
|
||||
}
|
||||
|
||||
#ifndef d_a_e_fz_nonmatching
|
||||
/* 806C13F8-806C1440 002B98 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
|
|
@ -1930,7 +1974,8 @@ asm void __dt__10cCcD_GSttsFv() {
|
|||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm daE_FZ_HIO_c::~daE_FZ_HIO_c() {
|
||||
// asm daE_FZ_HIO_c::~daE_FZ_HIO_c() {
|
||||
asm void __dt__12daE_FZ_HIO_cFv() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/e/d_a_e_fz/d_a_e_fz/__dt__12daE_FZ_HIO_cFv.s"
|
||||
}
|
||||
|
|
@ -1970,6 +2015,7 @@ static asm void func_806C14CC() {
|
|||
#include "asm/rel/d/a/e/d_a_e_fz/d_a_e_fz/func_806C14CC.s"
|
||||
}
|
||||
#pragma pop
|
||||
#endif
|
||||
|
||||
/* 806C14D4-806C18E8 002C74 0414+00 1/1 0/0 0/0 .text
|
||||
* setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz */
|
||||
|
|
@ -2051,6 +2097,7 @@ static asm int setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param
|
|||
#pragma pop
|
||||
#endif
|
||||
|
||||
#ifndef d_a_e_fz_nonmatching
|
||||
/* 806C18E8-806C1924 003088 003C+00 1/1 0/0 0/0 .text __dt__4cXyzFv */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
|
|
@ -2061,5 +2108,7 @@ asm void __dt__4cXyzFv() {
|
|||
#include "asm/rel/d/a/e/d_a_e_fz/d_a_e_fz/__dt__4cXyzFv.s"
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
#endif
|
||||
/* 806C19F4-806C19F4 0000BC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue