mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-21 22:10:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Player inlines and item enums

Browse Source
This commit is contained in:
LagoLunatic
2026-05-12 17:57:33 -04:00
parent cbd7e076c6
commit 10651a0c4e
42 changed files with 1015 additions and 1025 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/c/c_dylink.h
+4 -5
View File
@@ -10,13 +10,12 @@ struct cDylPhs {
static cPhs_State phase_03(void*);
static cPhs_State Link(request_of_phase_process_class*, s16);
static BOOL Unlink(request_of_phase_process_class*, s16);
};
struct DynamicNameTableEntry {
s16 mKey;
const char* name;
};
struct cDyl_DynamicName_t {
/* 0x00 */ s16 mKey;
/* 0x04 */ const char* name;
}; // Size: 0x08
BOOL cDyl_InitAsyncIsDone();
void cDyl_InitAsync();
include/d/actor/d_a_player.h
+201 -184
View File
@@ -30,7 +30,16 @@ STATIC_ASSERT(sizeof(daPy_mtxFollowEcallBack_c) == 0x0C);
class daPy_demo_c {
public:
enum {
enum Type_e {
/* 0x0 */ TYPE_NONE_e,
/* 0x1 */ TYPE_TOOL_e,
/* 0x2 */ TYPE_SYSTEM_e,
/* 0x3 */ TYPE_ORIGINAL_e,
/* 0x4 */ TYPE_START_e,
/* 0x5 */ TYPE_SPECIAL_e,
};
enum Mode_e {
/* 0x000 */ DEMO_UNK00_e = 0,
/* 0x001 */ DEMO_N_WAIT_e = 1,
/* 0x002 */ DEMO_N_WALK_e = 2,
@@ -110,25 +119,33 @@ public:
/* 0x200 */ DEMO_NEW_ANM0_e = 0x200,
};
void setDemoType(u16 pType) { mDemoType = pType; }
int getDemoType() const { return mDemoType; }
void setDemoMode(u32 mode) { mDemoMode = mode; }
void setDemoType(u16 pType) { mDemoType = pType; }
void resetDemoType() { setDemoType(TYPE_NONE_e); }
void setToolDemoType() { setDemoType(TYPE_TOOL_e); }
void setSystemDemoType() { setDemoType(TYPE_SYSTEM_e); }
void setOriginalDemoType() { setDemoType(TYPE_ORIGINAL_e); }
void setStartDemoType() { setDemoType(TYPE_START_e); }
void setSpecialDemoType() { setDemoType(TYPE_SPECIAL_e); }
u32 getDemoMode() const { return mDemoMode; }
int getParam1() const { return mParam1; }
void setDemoMode(u32 mode) { mDemoMode = mode; }
s16 getTimer() const { return mTimer; }
void setTimer(s16 time) { mTimer = time; }
void decTimer() { mTimer--; }
void setOriginalDemoType() { setDemoType(3); }
void setSpecialDemoType() { setDemoType(5); }
void setSystemDemoType() { setDemoType(2); }
void setStick(f32 stick) { mStick = stick; }
void setMoveAngle(s16 angle) { mDemoMoveAngle = angle; }
s16 getMoveAngle() const { return mDemoMoveAngle; }
f32 getStick() { return mStick; }
void setMoveAngle(s16 angle) { mDemoMoveAngle = angle; }
int getParam0() const { return mParam0; }
void setParam0(int value) { mParam0 = value; }
int getParam1() const { return mParam1; }
void setParam1(int value) { mParam1 = value; }
void setParam2(int value) { mParam2 = value; }
f32 getStick() { return mStick; }
void setStick(f32 stick) { mStick = stick; }
public:
/* 0x00 */ u16 mDemoType;
@@ -246,180 +263,180 @@ public:
enum daPy_FACE {
// Index in daPy_lk_c::mTexAnmIndexTable
daPyFace_TMABAA = 0x00,
daPyFace_TMABAA_TEUP = 0x01,
daPyFace_TMABAB = 0x02,
daPyFace_TMABAC = 0x03,
daPyFace_TMABACB = 0x04,
daPyFace_TMABACB_TEDW = 0x05,
daPyFace_TMABACC = 0x06,
daPyFace_TMABAD = 0x07,
daPyFace_TMABAD_TEDW = 0x08,
daPyFace_TMABAE = 0x09,
daPyFace_TMABAE_TEUP = 0x0A,
daPyFace_TMABAE_TEDW = 0x0B,
daPyFace_TMABAE_TEL = 0x0C,
daPyFace_TMABAE_TER = 0x0D,
daPyFace_TMABAF = 0x0E,
daPyFace_TMABAG = 0x0F,
daPyFace_TMABAH = 0x10,
daPyFace_TMABAI = 0x11,
daPyFace_TMABAJ_TEYORIME = 0x12,
daPyFace_TMABAD_TWAITPICKUP = 0x13,
daPyFace_TMABAC_THOOKSHOTJMP = 0x14,
daPyFace_TGRABP = 0x15,
daPyFace_TGRABUP = 0x16,
daPyFace_TGRABNG = 0x17,
daPyFace_TGRABTHROW = 0x18,
daPyFace_TGRABRE = 0x19,
daPyFace_TWALLWL = 0x1A,
daPyFace_TWALLWR = 0x1B,
daPyFace_TWALLPL = 0x1C,
daPyFace_TWALLPR = 0x1D,
daPyFace_TCUT = 0x1E,
daPyFace_TCUTEA = 0x1F,
daPyFace_TCUTEA_TECN = 0x20,
daPyFace_TEXCA1 = 0x21,
daPyFace_TEXCB1 = 0x22,
daPyFace_TJATTACK = 0x23,
daPyFace_TJATTACK_TEUP = 0x24,
daPyFace_TCUTTURNP = 0x25,
daPyFace_TCUTTURN = 0x26,
daPyFace_TMJMP = 0x27,
daPyFace_TMJMPC = 0x28,
daPyFace_TMROLLL = 0x29,
daPyFace_TMROLLR = 0x2A,
daPyFace_TMROLLLC = 0x2B,
daPyFace_TMROLLRC = 0x2C,
daPyFace_TMSTEPOVER = 0x2D,
daPyFace_TMSTEPOVERA = 0x2E,
daPyFace_TMSTEPOVERLAND = 0x2F,
daPyFace_TATNJL = 0x30,
daPyFace_TATNJR = 0x31,
daPyFace_TJMP = 0x32,
daPyFace_TROLLF = 0x33,
daPyFace_TROLLB = 0x34,
daPyFace_TROLLBLAND = 0x35,
daPyFace_TROLLFMIS = 0x36,
daPyFace_TFALL = 0x37,
daPyFace_TLANDDAMA = 0x38,
daPyFace_TLANDDAMAST = 0x39,
daPyFace_TDAM = 0x3A,
daPyFace_TDAMF = 0x3B,
daPyFace_TDAMFFUP = 0x3C,
daPyFace_TDAMFBUP = 0x3D,
daPyFace_TDAMFLUP = 0x3E,
daPyFace_TDAMFRUP = 0x3F,
daPyFace_TDAMDASH = 0x40,
daPyFace_TGUARD = 0x41,
daPyFace_TSLIDEF = 0x42,
daPyFace_TSLIDEFLAND = 0x43,
daPyFace_TSLIDEB = 0x44,
daPyFace_TSLIDEBLAND = 0x45,
daPyFace_TSWIMP = 0x46,
daPyFace_TSWIMING = 0x47,
daPyFace_TBOOMTHROW = 0x48,
daPyFace_TBOOMCATCH = 0x49,
daPyFace_TWALKPUSH = 0x4A,
daPyFace_TWALKPULL = 0x4B,
daPyFace_TVJMPCHA = 0x4C,
daPyFace_TVJMPCL = 0x4D,
daPyFace_TROPECLIMB = 0x4E,
daPyFace_TROPEDOWN = 0x4F,
daPyFace_TLADDERUPST = 0x50,
daPyFace_TLADDERDWST = 0x51,
daPyFace_TLADDERUPED = 0x52,
daPyFace_TLADDERDWED = 0x53,
daPyFace_THANGING = 0x54,
daPyFace_THANGUP = 0x55,
daPyFace_TLAVADAM = 0x56,
daPyFace_TCUTRE = 0x57,
daPyFace_TCUTTURNB = 0x58,
daPyFace_TWAITATOB = 0x59,
daPyFace_TCOMEOUT = 0x5A,
daPyFace_THOLDUP = 0x5B,
daPyFace_TWALLHOLDUP = 0x5C,
daPyFace_TITEMGET = 0x5D,
daPyFace_TSALTATION = 0x5E,
daPyFace_TWHO = 0x5F,
daPyFace_TPICKUP = 0x60,
daPyFace_TBOXOPENLINK = 0x61,
daPyFace_TBOXOPENSHORTLINK = 0x62,
daPyFace_TDIELONG = 0x63,
daPyFace_TSWIMDIE = 0x64,
daPyFace_TSURPRISED = 0x65,
daPyFace_TTURNBACK = 0x66,
daPyFace_TLOOKUP = 0x67,
daPyFace_TWAITQ = 0x68,
daPyFace_TGLAD = 0x69,
daPyFace_TCUTBOKO = 0x6A,
daPyFace_SHIP_JUMP1 = 0x6B,
daPyFace_SHIP_JUMP2 = 0x6C,
daPyFace_TUSEFANA = 0x6D,
daPyFace_TUSEFANB = 0x6E,
daPyFace_TUSEFANB2 = 0x6F,
daPyFace_TBOWWAIT = 0x70,
daPyFace_TVOMITJMP = 0x71,
daPyFace_TREST = 0x72,
daPyFace_TTAKE = 0x73,
daPyFace_TTAKELR = 0x74,
daPyFace_TSLIPICE = 0x75,
daPyFace_THAMSWINGA = 0x76,
daPyFace_THAMSWINGBPRE = 0x77,
daPyFace_THAMSWINGBHIT = 0x78,
daPyFace_THAMSWINGBEND = 0x79,
daPyFace_TSETBOOTS = 0x7A,
daPyFace_TDOOROPENALINK = 0x7B,
daPyFace_TDOOROPENBLINK = 0x7C,
daPyFace_TSEYYES = 0x7D,
daPyFace_TPRESENTATIONA = 0x7E,
daPyFace_TWINDL = 0x7F,
daPyFace_TWINDR = 0x80,
daPyFace_TPRESENTATIONB = 0x81,
daPyFace_TBINDRINKPRE = 0x82,
daPyFace_TBINDRINKING = 0x83,
daPyFace_TBINDRINKAFTER = 0x84,
daPyFace_TBINDRINKPRE2 = 0x85,
daPyFace_TBINDRINKING2 = 0x86,
daPyFace_TBINDRINKAFTER2 = 0x87,
daPyFace_TBINOPENPRE = 0x88,
daPyFace_TBINOPENA = 0x89,
daPyFace_TBINOPENB = 0x8A,
daPyFace_TBINSWING = 0x8B,
daPyFace_TBINGET = 0x8C,
daPyFace_TARROWRELORD = 0x8D,
daPyFace_TSURPRISEDB = 0x8E,
daPyFace_TFAN = 0x8F,
daPyFace_TNENRIKI = 0x90,
daPyFace_TMABAB_TEDL = 0x91,
daPyFace_TMABAH_TABEKOBE = 0x92,
daPyFace_TSETHYOINOMI = 0x93,
daPyFace_LINK_FREEZ = 0x94,
daPyFace_LINK_MOGAKI = 0x95,
daPyFace_TDAMBIRI = 0x96,
daPyFace_SALVLR = 0x97,
daPyFace_SALVWAIT = 0x98,
daPyFace_SALVBAD = 0x99,
daPyFace_SALVGOOD = 0x9A,
daPyFace_SEARESET = 0x9B,
daPyFace_TWARPIN = 0x9C,
daPyFace_TWARPOUT = 0x9D,
daPyFace_TPOWUPWAIT = 0x9E,
daPyFace_TPOWUP = 0x9F,
daPyFace_TCUTKESA = 0xA0,
daPyFace_TWARPOUTFIRST = 0xA1,
daPyFace_TDASHKAZE = 0xA2,
daPyFace_TIYAYA = 0xA3,
daPyFace_TFREEA = 0xA4,
daPyFace_TFREEB = 0xA5,
daPyFace_TFREED = 0xA6,
daPyFace_TTAKTKAZE = 0xA7,
daPyFace_TTAKTSIPPU = 0xA8,
daPyFace_TTAKTCHUYA = 0xA9,
daPyFace_TTAKTFUJIN = 0xAA,
daPyFace_TTAKTAYATSURI = 0xAB,
daPyFace_TTAKTCHISIN = 0xAC,
daPyFace_UNKNOWN = 0xAD, // Not an index, this is a special value checked in checkNormalFace()
/* 0x00 */ daPyFace_TMABAA,
/* 0x01 */ daPyFace_TMABAA_TEUP,
/* 0x02 */ daPyFace_TMABAB,
/* 0x03 */ daPyFace_TMABAC,
/* 0x04 */ daPyFace_TMABACB,
/* 0x05 */ daPyFace_TMABACB_TEDW,
/* 0x06 */ daPyFace_TMABACC,
/* 0x07 */ daPyFace_TMABAD,
/* 0x08 */ daPyFace_TMABAD_TEDW,
/* 0x09 */ daPyFace_TMABAE,
/* 0x0A */ daPyFace_TMABAE_TEUP,
/* 0x0B */ daPyFace_TMABAE_TEDW,
/* 0x0C */ daPyFace_TMABAE_TEL,
/* 0x0D */ daPyFace_TMABAE_TER,
/* 0x0E */ daPyFace_TMABAF,
/* 0x0F */ daPyFace_TMABAG,
/* 0x10 */ daPyFace_TMABAH,
/* 0x11 */ daPyFace_TMABAI,
/* 0x12 */ daPyFace_TMABAJ_TEYORIME,
/* 0x13 */ daPyFace_TMABAD_TWAITPICKUP,
/* 0x14 */ daPyFace_TMABAC_THOOKSHOTJMP,
/* 0x15 */ daPyFace_TGRABP,
/* 0x16 */ daPyFace_TGRABUP,
/* 0x17 */ daPyFace_TGRABNG,
/* 0x18 */ daPyFace_TGRABTHROW,
/* 0x19 */ daPyFace_TGRABRE,
/* 0x1A */ daPyFace_TWALLWL,
/* 0x1B */ daPyFace_TWALLWR,
/* 0x1C */ daPyFace_TWALLPL,
/* 0x1D */ daPyFace_TWALLPR,
/* 0x1E */ daPyFace_TCUT,
/* 0x1F */ daPyFace_TCUTEA,
/* 0x20 */ daPyFace_TCUTEA_TECN,
/* 0x21 */ daPyFace_TEXCA1,
/* 0x22 */ daPyFace_TEXCB1,
/* 0x23 */ daPyFace_TJATTACK,
/* 0x24 */ daPyFace_TJATTACK_TEUP,
/* 0x25 */ daPyFace_TCUTTURNP,
/* 0x26 */ daPyFace_TCUTTURN,
/* 0x27 */ daPyFace_TMJMP,
/* 0x28 */ daPyFace_TMJMPC,
/* 0x29 */ daPyFace_TMROLLL,
/* 0x2A */ daPyFace_TMROLLR,
/* 0x2B */ daPyFace_TMROLLLC,
/* 0x2C */ daPyFace_TMROLLRC,
/* 0x2D */ daPyFace_TMSTEPOVER,
/* 0x2E */ daPyFace_TMSTEPOVERA,
/* 0x2F */ daPyFace_TMSTEPOVERLAND,
/* 0x30 */ daPyFace_TATNJL,
/* 0x31 */ daPyFace_TATNJR,
/* 0x32 */ daPyFace_TJMP,
/* 0x33 */ daPyFace_TROLLF,
/* 0x34 */ daPyFace_TROLLB,
/* 0x35 */ daPyFace_TROLLBLAND,
/* 0x36 */ daPyFace_TROLLFMIS,
/* 0x37 */ daPyFace_TFALL,
/* 0x38 */ daPyFace_TLANDDAMA,
/* 0x39 */ daPyFace_TLANDDAMAST,
/* 0x3A */ daPyFace_TDAM,
/* 0x3B */ daPyFace_TDAMF,
/* 0x3C */ daPyFace_TDAMFFUP,
/* 0x3D */ daPyFace_TDAMFBUP,
/* 0x3E */ daPyFace_TDAMFLUP,
/* 0x3F */ daPyFace_TDAMFRUP,
/* 0x40 */ daPyFace_TDAMDASH,
/* 0x41 */ daPyFace_TGUARD,
/* 0x42 */ daPyFace_TSLIDEF,
/* 0x43 */ daPyFace_TSLIDEFLAND,
/* 0x44 */ daPyFace_TSLIDEB,
/* 0x45 */ daPyFace_TSLIDEBLAND,
/* 0x46 */ daPyFace_TSWIMP,
/* 0x47 */ daPyFace_TSWIMING,
/* 0x48 */ daPyFace_TBOOMTHROW,
/* 0x49 */ daPyFace_TBOOMCATCH,
/* 0x4A */ daPyFace_TWALKPUSH,
/* 0x4B */ daPyFace_TWALKPULL,
/* 0x4C */ daPyFace_TVJMPCHA,
/* 0x4D */ daPyFace_TVJMPCL,
/* 0x4E */ daPyFace_TROPECLIMB,
/* 0x4F */ daPyFace_TROPEDOWN,
/* 0x50 */ daPyFace_TLADDERUPST,
/* 0x51 */ daPyFace_TLADDERDWST,
/* 0x52 */ daPyFace_TLADDERUPED,
/* 0x53 */ daPyFace_TLADDERDWED,
/* 0x54 */ daPyFace_THANGING,
/* 0x55 */ daPyFace_THANGUP,
/* 0x56 */ daPyFace_TLAVADAM,
/* 0x57 */ daPyFace_TCUTRE,
/* 0x58 */ daPyFace_TCUTTURNB,
/* 0x59 */ daPyFace_TWAITATOB,
/* 0x5A */ daPyFace_TCOMEOUT,
/* 0x5B */ daPyFace_THOLDUP,
/* 0x5C */ daPyFace_TWALLHOLDUP,
/* 0x5D */ daPyFace_TITEMGET,
/* 0x5E */ daPyFace_TSALTATION,
/* 0x5F */ daPyFace_TWHO,
/* 0x60 */ daPyFace_TPICKUP,
/* 0x61 */ daPyFace_TBOXOPENLINK,
/* 0x62 */ daPyFace_TBOXOPENSHORTLINK,
/* 0x63 */ daPyFace_TDIELONG,
/* 0x64 */ daPyFace_TSWIMDIE,
/* 0x65 */ daPyFace_TSURPRISED,
/* 0x66 */ daPyFace_TTURNBACK,
/* 0x67 */ daPyFace_TLOOKUP,
/* 0x68 */ daPyFace_TWAITQ,
/* 0x69 */ daPyFace_TGLAD,
/* 0x6A */ daPyFace_TCUTBOKO,
/* 0x6B */ daPyFace_SHIP_JUMP1,
/* 0x6C */ daPyFace_SHIP_JUMP2,
/* 0x6D */ daPyFace_TUSEFANA,
/* 0x6E */ daPyFace_TUSEFANB,
/* 0x6F */ daPyFace_TUSEFANB2,
/* 0x70 */ daPyFace_TBOWWAIT,
/* 0x71 */ daPyFace_TVOMITJMP,
/* 0x72 */ daPyFace_TREST,
/* 0x73 */ daPyFace_TTAKE,
/* 0x74 */ daPyFace_TTAKELR,
/* 0x75 */ daPyFace_TSLIPICE,
/* 0x76 */ daPyFace_THAMSWINGA,
/* 0x77 */ daPyFace_THAMSWINGBPRE,
/* 0x78 */ daPyFace_THAMSWINGBHIT,
/* 0x79 */ daPyFace_THAMSWINGBEND,
/* 0x7A */ daPyFace_TSETBOOTS,
/* 0x7B */ daPyFace_TDOOROPENALINK,
/* 0x7C */ daPyFace_TDOOROPENBLINK,
/* 0x7D */ daPyFace_TSEYYES,
/* 0x7E */ daPyFace_TPRESENTATIONA,
/* 0x7F */ daPyFace_TWINDL,
/* 0x80 */ daPyFace_TWINDR,
/* 0x81 */ daPyFace_TPRESENTATIONB,
/* 0x82 */ daPyFace_TBINDRINKPRE,
/* 0x83 */ daPyFace_TBINDRINKING,
/* 0x84 */ daPyFace_TBINDRINKAFTER,
/* 0x85 */ daPyFace_TBINDRINKPRE2,
/* 0x86 */ daPyFace_TBINDRINKING2,
/* 0x87 */ daPyFace_TBINDRINKAFTER2,
/* 0x88 */ daPyFace_TBINOPENPRE,
/* 0x89 */ daPyFace_TBINOPENA,
/* 0x8A */ daPyFace_TBINOPENB,
/* 0x8B */ daPyFace_TBINSWING,
/* 0x8C */ daPyFace_TBINGET,
/* 0x8D */ daPyFace_TARROWRELORD,
/* 0x8E */ daPyFace_TSURPRISEDB,
/* 0x8F */ daPyFace_TFAN,
/* 0x90 */ daPyFace_TNENRIKI,
/* 0x91 */ daPyFace_TMABAB_TEDL,
/* 0x92 */ daPyFace_TMABAH_TABEKOBE,
/* 0x93 */ daPyFace_TSETHYOINOMI,
/* 0x94 */ daPyFace_LINK_FREEZ,
/* 0x95 */ daPyFace_LINK_MOGAKI,
/* 0x96 */ daPyFace_TDAMBIRI,
/* 0x97 */ daPyFace_SALVLR,
/* 0x98 */ daPyFace_SALVWAIT,
/* 0x99 */ daPyFace_SALVBAD,
/* 0x9A */ daPyFace_SALVGOOD,
/* 0x9B */ daPyFace_SEARESET,
/* 0x9C */ daPyFace_TWARPIN,
/* 0x9D */ daPyFace_TWARPOUT,
/* 0x9E */ daPyFace_TPOWUPWAIT,
/* 0x9F */ daPyFace_TPOWUP,
/* 0xA0 */ daPyFace_TCUTKESA,
/* 0xA1 */ daPyFace_TWARPOUTFIRST,
/* 0xA2 */ daPyFace_TDASHKAZE,
/* 0xA3 */ daPyFace_TIYAYA,
/* 0xA4 */ daPyFace_TFREEA,
/* 0xA5 */ daPyFace_TFREEB,
/* 0xA6 */ daPyFace_TFREED,
/* 0xA7 */ daPyFace_TTAKTKAZE,
/* 0xA8 */ daPyFace_TTAKTSIPPU,
/* 0xA9 */ daPyFace_TTAKTCHUYA,
/* 0xAA */ daPyFace_TTAKTFUJIN,
/* 0xAB */ daPyFace_TTAKTAYATSURI,
/* 0xAC */ daPyFace_TTAKTCHISIN,
/* 0xAD */ daPyFace_NONE, // Not an index, this is a special value checked in checkFaceTypeNot()
};
enum daPy_CUT_TYPE {
include/d/actor/d_a_player_main.h
+22 -16
View File
@@ -1857,20 +1857,27 @@ public:
cXyz getBoomerangCatchPos() const { return mBoomerangCatchPos; }
cXyz getLineTopPos() { return mSightPacket.getPos(); }
cXyz getHookshotRootPos() const { return mHookshotRootPos; }
void getIceParticleBtk() {}
void getIceWaterParticleBtk() {}
void getShadowID() const {}
void npcStartRestartRoom() { startRestartRoom(5, 0xC9, -1.0f, 0); }
void setDaiokutaEnd() {}
void setDaiokutaEnd() { startRestartRoom(6, 0xC9, -1.0f, 1); }
void setWhirlId(fpc_ProcID id) { mWhirlId = id; }
void decrementBombCnt() {
if (mActivePlayerBombs != 0) {
mActivePlayerBombs--;
}
}
J3DAnmTextureSRTKey* getIceParticleBtk() { return mpGicer00Btk; }
J3DAnmTextureSRTKey* getIceWaterParticleBtk() { return mpGicer01Btk; }
void getBombWaterPillarBrk() {} // mpGwp00BrkData?
void getBombWaterPillarBtk() {} // mpGwp00BtkData?
BOOL checkSwordEquip() const {
return dComIfGs_getSelectEquip(0) != dItem_NONE_e || checkSwordMiniGame();
}
BOOL checkShieldEquip() const { return dComIfGs_getSelectEquip(1) != dItem_NONE_e; }
BOOL checkMirrorShieldEquip() const { return dComIfGs_getSelectEquip(1) == dItem_MIRROR_SHIELD_e; }
BOOL checkPowerGloveEquip() const { return dComIfGs_getSelectEquip(2) == dItem_POWER_BRACELETS_e; }
int getStartRoomNo() { return fopAcM_GetParam(this) & 0x3F; }
int getStartMode() { return (fopAcM_GetParam(this) >> 0x0C) & 0xF; }
@@ -1907,30 +1914,29 @@ public:
BOOL allTrigger() const { return mItemTrigger & (BTN_A | BTN_B | BTN_X | BTN_Y | BTN_Z); }
void otherWeaponTrigger() const {}
BOOL checkPlayerDemoMode() const { return mDemo.getDemoType() != 0; }
void checkSpecialDemoMode() const {}
BOOL checkPlayerDemoMode() const { return mDemo.getDemoType() != daPy_demo_c::TYPE_NONE_e; }
BOOL checkSpecialDemoMode() const { return mDemo.getDemoType() == daPy_demo_c::TYPE_SPECIAL_e; }
f32 getAnmSpeedStickRate(f32 param_0, f32 param_1) {
return param_0 + (mStickDistance * (param_1 - param_0));
}
void seStartSystem(u32 i_seNum) { mDoAud_seStart(i_seNum); }
BOOL checkAttentionLock() { return mpAttention->Lockon(); }
void checkBoomerangRock() {}
BOOL checkBoomerangRock() {
return (mCurProc == daPy_lk_c::daPyProc_BOOMERANG_SUBJECT_e ||
mCurProc == daPy_lk_c::daPyProc_SHIP_BOOMERANG_e) &&
mSightPacket.getDrawFlg();
}
BOOL checkFaceTypeNot() const { return mFace == daPyFace_NONE; }
BOOL checkCrawlWaterIn() { return mWaterY > current.pos.y + 15.0f; }
void setFootEffectPosType(u8 type) { mFootEffectPosType = type; }
void checkBothItemEquipAnime() const {}
void checkCrawlWaterIn() {}
void checkDoubleItemEquipAnime() const {}
void checkFaceTypeNot() const {}
void checkIsland() const {}
void checkMirrorShieldEquip() const {}
void checkPowerGloveEquip() const {}
void checkRopeThrowAnime() const {}
void checkShieldEquip() const {}
void checkSwordEquipAnime() const {}
void getBombWaterPillarBrk() {} // mpGwp00BrkData?
void getBombWaterPillarBtk() {} // mpGwp00BtkData?
void getTactLeftHandPos() const {}
void setFootEffectPosType(u8) {}
void setSpeedAndAngleBoomerang() {}
void setSpeedAndAngleBow() {}
void setSpeedAndAngleHookshot() {}
@@ -2133,7 +2139,7 @@ public:
/* 0x34BB */ u8 mCurrItemHeapIdx;
/* 0x34BC */ u8 m34BC;
/* 0x34BD */ u8 mReadyItemBtn; // Which of the three item buttons the player last used.
/* 0x34BE */ u8 m34BE;
/* 0x34BE */ u8 mFootEffectPosType;
/* 0x34BF */ s8 mReverb;
/* 0x34C0 */ u8 mLeftHandIdx;
/* 0x34C1 */ u8 mRightHandIdx;
@@ -2258,7 +2264,7 @@ public:
/* 0x35C4 */ f32 m35C4;
/* 0x35C8 */ f32 m35C8;
/* 0x35CC */ f32 m35CC;
/* 0x35D0 */ f32 m35D0;
/* 0x35D0 */ f32 mWaterY;
/* 0x35D4 */ f32 m35D4;
/* 0x35D8 */ f32 m35D8;
/* 0x35DC */ f32 mHangGroundH;
include/d/d_com_inf_game.h
+27 -14
View File
@@ -1214,12 +1214,25 @@ inline void dComIfGs_setPictureNum(u8 num) {
g_dComIfG_gameInfo.save.getPlayer().getItemRecord().setPictureNum(num);
}
inline u8 dComIfGs_getBeastNum(int i_idx) {
return g_dComIfG_gameInfo.save.getPlayer().getBagItemRecord().getBeastNum(i_idx);
// The index into the Spoils Bag for each type of spoil.
enum dBeastIndex_e {
/* 0x0 */ dBeastIdx_SKULL_NECKLACE_e,
/* 0x1 */ dBeastIdx_BOKOBABA_SEED_e,
/* 0x2 */ dBeastIdx_GOLDEN_FEATHER_e,
/* 0x3 */ dBeastIdx_KNIGHTS_CREST_e,
/* 0x4 */ dBeastIdx_RED_JELLY_e,
/* 0x5 */ dBeastIdx_GREEN_JELLY_e,
/* 0x6 */ dBeastIdx_BLUE_JELLY_e,
/* 0x7 */ dBeastIdx_JOY_PENDANT_e,
/* 0x8 */ dBeastIdx_COUNT_e,
};
inline u8 dComIfGs_getBeastNum(int i_beastIdx) {
return g_dComIfG_gameInfo.save.getPlayer().getBagItemRecord().getBeastNum(i_beastIdx);
}
inline void dComIfGs_setBeastNum(int i_idx, u8 num) {
g_dComIfG_gameInfo.save.getPlayer().getBagItemRecord().setBeastNum(i_idx, num);
inline void dComIfGs_setBeastNum(int i_beastIdx, u8 num) {
g_dComIfG_gameInfo.save.getPlayer().getBagItemRecord().setBeastNum(i_beastIdx, num);
}
inline u8 dComIfGs_getBaitNum(int i_idx) {
@@ -1771,12 +1784,12 @@ inline void dComIfGs_onGetItem(int i_field, u8 i_item) {
return g_dComIfG_gameInfo.save.getPlayer().getGetItem().onItem(i_field, i_item);
}
inline BOOL dComIfGs_isGetItemBeast(u8 i_beast) {
return g_dComIfG_gameInfo.save.getPlayer().getGetBagItem().isBeast(i_beast);
inline BOOL dComIfGs_isGetItemBeast(u8 i_beastIdx) {
return g_dComIfG_gameInfo.save.getPlayer().getGetBagItem().isBeast(i_beastIdx);
}
inline void dComIfGs_onGetItemBeast(u8 i_beast) {
g_dComIfG_gameInfo.save.getPlayer().getGetBagItem().onBeast(i_beast);
inline void dComIfGs_onGetItemBeast(u8 i_beastIdx) {
g_dComIfG_gameInfo.save.getPlayer().getGetBagItem().onBeast(i_beastIdx);
}
inline BOOL dComIfGs_isGetItemBait(u8 i_bait) {
@@ -2633,16 +2646,16 @@ inline void dComIfGp_clearItemArrowNumCount() {
g_dComIfG_gameInfo.play.clearItemArrowNumCount();
}
inline void dComIfGp_setItemBeastNumCount(int i_idx, s16 num) {
g_dComIfG_gameInfo.play.setItemBeastNumCount(i_idx, num);
inline s16 dComIfGp_getItemBeastNumCount(int i_beastIdx) {
return g_dComIfG_gameInfo.play.getItemBeastNumCount(i_beastIdx);
}
inline s16 dComIfGp_getItemBeastNumCount(int i_idx) {
return g_dComIfG_gameInfo.play.getItemBeastNumCount(i_idx);
inline void dComIfGp_setItemBeastNumCount(int i_beastIdx, s16 num) {
g_dComIfG_gameInfo.play.setItemBeastNumCount(i_beastIdx, num);
}
inline void dComIfGp_clearItemBeastNumCount(int i_idx) {
g_dComIfG_gameInfo.play.clearItemBeastNumCount(i_idx);
inline void dComIfGp_clearItemBeastNumCount(int i_beastIdx) {
g_dComIfG_gameInfo.play.clearItemBeastNumCount(i_beastIdx);
}
inline u8 dComIfGp_getScopeType() {
include/d/d_item_data.h
+1 -1
View File
@@ -76,7 +76,7 @@ enum ItemTable {
/* 0x45 */ dItem_SKULL_NECKLACE_e,
/* 0x46 */ dItem_BOKOBABA_SEED_e,
/* 0x47 */ dItem_GOLDEN_FEATHER_e,
/* 0x48 */ BOKO_BELT,
/* 0x48 */ dItem_KNIGHTS_CREST_e,
/* 0x49 */ dItem_RED_JELLY_e,
/* 0x4A */ dItem_GREEN_JELLY_e,
/* 0x4B */ dItem_BLUE_JELLY_e,
include/d/d_meter.h
+213 -212
View File
@@ -1,6 +1,7 @@
#ifndef D_METER_H
#define D_METER_H
#include "d/d_com_inf_game.h"
#include "d/d_drawlist.h"
#include "f_op/f_op_msg_mng.h"
#include "m_Do/m_Do_hostIO.h"
@@ -21,7 +22,7 @@ public:
/* 0x004 */ s8 mNo;
/* 0x005 */ u8 field_0x5[0x006 - 0x005];
/* 0x006 */ short field_0x6;
/* 0x006 */ s16 field_0x6;
/* 0x008 */ u8 field_0x8[0x00C - 0x008];
/* 0x00C */ f32 field_0xc;
/* 0x010 */ f32 field_0x10;
@@ -33,134 +34,134 @@ public:
/* 0x028 */ f32 field_0x28;
/* 0x02C */ u8 field_0x2c;
/* 0x02D */ u8 field_0x2d;
/* 0x02E */ short field_0x2e;
/* 0x030 */ short field_0x30;
/* 0x032 */ short field_0x32;
/* 0x034 */ short field_0x34;
/* 0x036 */ short field_0x36;
/* 0x038 */ short field_0x38;
/* 0x02E */ s16 field_0x2e;
/* 0x030 */ s16 field_0x30;
/* 0x032 */ s16 field_0x32;
/* 0x034 */ s16 field_0x34;
/* 0x036 */ s16 field_0x36;
/* 0x038 */ s16 field_0x38;
/* 0x03A */ u8 field_0x3A[0x03C - 0x03A];
/* 0x03C */ f32 field_0x3c;
/* 0x040 */ short field_0x40;
/* 0x042 */ short field_0x42;
/* 0x044 */ short field_0x44;
/* 0x046 */ short field_0x46;
/* 0x040 */ s16 field_0x40;
/* 0x042 */ s16 field_0x42;
/* 0x044 */ s16 field_0x44;
/* 0x046 */ s16 field_0x46;
/* 0x048 */ f32 field_0x48;
/* 0x04C */ f32 field_0x4c;
/* 0x050 */ short field_0x50;
/* 0x052 */ short field_0x52;
/* 0x054 */ short field_0x54;
/* 0x056 */ short field_0x56;
/* 0x050 */ s16 field_0x50;
/* 0x052 */ s16 field_0x52;
/* 0x054 */ s16 field_0x54;
/* 0x056 */ s16 field_0x56;
/* 0x058 */ f32 field_0x58;
/* 0x05C */ f32 field_0x5c;
/* 0x060 */ u8 field_0x60;
/* 0x061 */ u8 field_0x61;
/* 0x062 */ u8 field_0x62;
/* 0x063 */ u8 field_0x63;
/* 0x064 */ short field_0x64;
/* 0x066 */ short field_0x66;
/* 0x068 */ short field_0x68;
/* 0x06A */ short field_0x6a;
/* 0x06C */ short field_0x6c[3];
/* 0x072 */ short field_0x72[3];
/* 0x078 */ short field_0x78[3];
/* 0x07E */ short field_0x7e;
/* 0x064 */ s16 field_0x64;
/* 0x066 */ s16 field_0x66;
/* 0x068 */ s16 field_0x68;
/* 0x06A */ s16 field_0x6a;
/* 0x06C */ s16 field_0x6c[3];
/* 0x072 */ s16 field_0x72[3];
/* 0x078 */ s16 field_0x78[3];
/* 0x07E */ s16 field_0x7e;
/* 0x080 */ u8 field_0x80[0x088 - 0x080];
/* 0x088 */ short field_0x88;
/* 0x08A */ short field_0x8a;
/* 0x08C */ short field_0x8c;
/* 0x08E */ short field_0x8e;
/* 0x090 */ short field_0x90;
/* 0x092 */ short field_0x92;
/* 0x094 */ short field_0x94;
/* 0x096 */ short field_0x96;
/* 0x098 */ short field_0x98;
/* 0x09A */ short field_0x9a;
/* 0x09C */ short field_0x9c;
/* 0x09E */ short field_0x9e;
/* 0x0A0 */ short field_0xa0;
/* 0x0A2 */ short field_0xa2;
/* 0x0A4 */ short field_0xa4;
/* 0x0A6 */ short field_0xa6;
/* 0x0A8 */ short field_0xa8;
/* 0x0AA */ short field_0xaa;
/* 0x0AC */ short field_0xac;
/* 0x0AE */ short field_0xae;
/* 0x0B0 */ short field_0xb0;
/* 0x0B2 */ short field_0xb2;
/* 0x0B4 */ short field_0xb4;
/* 0x0B6 */ short field_0xb6;
/* 0x0B8 */ short field_0xb8;
/* 0x0BA */ short field_0xba;
/* 0x0BC */ short field_0xbc;
/* 0x0BE */ short field_0xbe;
/* 0x0C0 */ short field_0xc0;
/* 0x0C2 */ short field_0xc2;
/* 0x0C4 */ short field_0xc4;
/* 0x0C6 */ short field_0xc6;
/* 0x0C8 */ short field_0xc8;
/* 0x0CA */ short field_0xca;
/* 0x0CC */ short field_0xcc;
/* 0x0CE */ short field_0xce;
/* 0x0D0 */ short field_0xd0;
/* 0x0D2 */ short field_0xd2;
/* 0x0D4 */ short field_0xd4;
/* 0x0D6 */ short field_0xd6;
/* 0x0D8 */ short field_0xd8;
/* 0x0DA */ short field_0xda;
/* 0x0DC */ short field_0xdc;
/* 0x0DE */ short field_0xde;
/* 0x0E0 */ short field_0xe0;
/* 0x0E2 */ short field_0xe2;
/* 0x0E4 */ short field_0xe4;
/* 0x0E6 */ short field_0xe6;
/* 0x0E8 */ short field_0xe8;
/* 0x0EA */ short field_0xea;
/* 0x0EC */ short field_0xec;
/* 0x0EE */ short field_0xee;
/* 0x0F0 */ short field_0xf0;
/* 0x0F2 */ short field_0xf2;
/* 0x0F4 */ short field_0xf4;
/* 0x0F6 */ short field_0xf6;
/* 0x0F8 */ short field_0xf8;
/* 0x0FA */ short field_0xfa;
/* 0x0FC */ short field_0xfc;
/* 0x0FE */ short field_0xfe;
/* 0x100 */ short field_0x100;
/* 0x102 */ short field_0x102;
/* 0x104 */ short field_0x104;
/* 0x106 */ short field_0x106;
/* 0x108 */ short field_0x108;
/* 0x10A */ short field_0x10a;
/* 0x10C */ short field_0x10c;
/* 0x10E */ short field_0x10e;
/* 0x110 */ short field_0x110;
/* 0x112 */ short field_0x112;
/* 0x114 */ short field_0x114;
/* 0x116 */ short field_0x116;
/* 0x118 */ short field_0x118;
/* 0x11A */ short field_0x11a;
/* 0x11C */ short field_0x11c;
/* 0x11E */ short field_0x11e;
/* 0x088 */ s16 field_0x88;
/* 0x08A */ s16 field_0x8a;
/* 0x08C */ s16 field_0x8c;
/* 0x08E */ s16 field_0x8e;
/* 0x090 */ s16 field_0x90;
/* 0x092 */ s16 field_0x92;
/* 0x094 */ s16 field_0x94;
/* 0x096 */ s16 field_0x96;
/* 0x098 */ s16 field_0x98;
/* 0x09A */ s16 field_0x9a;
/* 0x09C */ s16 field_0x9c;
/* 0x09E */ s16 field_0x9e;
/* 0x0A0 */ s16 field_0xa0;
/* 0x0A2 */ s16 field_0xa2;
/* 0x0A4 */ s16 field_0xa4;
/* 0x0A6 */ s16 field_0xa6;
/* 0x0A8 */ s16 field_0xa8;
/* 0x0AA */ s16 field_0xaa;
/* 0x0AC */ s16 field_0xac;
/* 0x0AE */ s16 field_0xae;
/* 0x0B0 */ s16 field_0xb0;
/* 0x0B2 */ s16 field_0xb2;
/* 0x0B4 */ s16 field_0xb4;
/* 0x0B6 */ s16 field_0xb6;
/* 0x0B8 */ s16 field_0xb8;
/* 0x0BA */ s16 field_0xba;
/* 0x0BC */ s16 field_0xbc;
/* 0x0BE */ s16 field_0xbe;
/* 0x0C0 */ s16 field_0xc0;
/* 0x0C2 */ s16 field_0xc2;
/* 0x0C4 */ s16 field_0xc4;
/* 0x0C6 */ s16 field_0xc6;
/* 0x0C8 */ s16 field_0xc8;
/* 0x0CA */ s16 field_0xca;
/* 0x0CC */ s16 field_0xcc;
/* 0x0CE */ s16 field_0xce;
/* 0x0D0 */ s16 field_0xd0;
/* 0x0D2 */ s16 field_0xd2;
/* 0x0D4 */ s16 field_0xd4;
/* 0x0D6 */ s16 field_0xd6;
/* 0x0D8 */ s16 field_0xd8;
/* 0x0DA */ s16 field_0xda;
/* 0x0DC */ s16 field_0xdc;
/* 0x0DE */ s16 field_0xde;
/* 0x0E0 */ s16 field_0xe0;
/* 0x0E2 */ s16 field_0xe2;
/* 0x0E4 */ s16 field_0xe4;
/* 0x0E6 */ s16 field_0xe6;
/* 0x0E8 */ s16 field_0xe8;
/* 0x0EA */ s16 field_0xea;
/* 0x0EC */ s16 field_0xec;
/* 0x0EE */ s16 field_0xee;
/* 0x0F0 */ s16 field_0xf0;
/* 0x0F2 */ s16 field_0xf2;
/* 0x0F4 */ s16 field_0xf4;
/* 0x0F6 */ s16 field_0xf6;
/* 0x0F8 */ s16 field_0xf8;
/* 0x0FA */ s16 field_0xfa;
/* 0x0FC */ s16 field_0xfc;
/* 0x0FE */ s16 field_0xfe;
/* 0x100 */ s16 field_0x100;
/* 0x102 */ s16 field_0x102;
/* 0x104 */ s16 field_0x104;
/* 0x106 */ s16 field_0x106;
/* 0x108 */ s16 field_0x108;
/* 0x10A */ s16 field_0x10a;
/* 0x10C */ s16 field_0x10c;
/* 0x10E */ s16 field_0x10e;
/* 0x110 */ s16 field_0x110;
/* 0x112 */ s16 field_0x112;
/* 0x114 */ s16 field_0x114;
/* 0x116 */ s16 field_0x116;
/* 0x118 */ s16 field_0x118;
/* 0x11A */ s16 field_0x11a;
/* 0x11C */ s16 field_0x11c;
/* 0x11E */ s16 field_0x11e;
/* 0x120 */ u8 field_0x120;
/* 0x121 */ u8 field_0x121;
/* 0x122 */ u8 field_0x122;
/* 0x123 */ u8 field_0x123;
/* 0x124 */ short field_0x124;
/* 0x126 */ short field_0x126;
/* 0x128 */ short field_0x128;
/* 0x12A */ short field_0x12a;
/* 0x12C */ short field_0x12c;
/* 0x12E */ short field_0x12e;
/* 0x130 */ short field_0x130;
/* 0x132 */ short field_0x132;
/* 0x134 */ short field_0x134;
/* 0x136 */ short field_0x136;
/* 0x138 */ short field_0x138;
/* 0x13A */ short field_0x13a;
/* 0x13C */ short field_0x13c;
/* 0x13E */ short field_0x13e;
/* 0x140 */ short field_0x140;
/* 0x124 */ s16 field_0x124;
/* 0x126 */ s16 field_0x126;
/* 0x128 */ s16 field_0x128;
/* 0x12A */ s16 field_0x12a;
/* 0x12C */ s16 field_0x12c;
/* 0x12E */ s16 field_0x12e;
/* 0x130 */ s16 field_0x130;
/* 0x132 */ s16 field_0x132;
/* 0x134 */ s16 field_0x134;
/* 0x136 */ s16 field_0x136;
/* 0x138 */ s16 field_0x138;
/* 0x13A */ s16 field_0x13a;
/* 0x13C */ s16 field_0x13c;
/* 0x13E */ s16 field_0x13e;
/* 0x140 */ s16 field_0x140;
/* 0x142 */ u8 field_0x142;
/* 0x143 */ u8 field_0x143;
/* 0x144 */ u8 field_0x144;
@@ -173,10 +174,10 @@ public:
/* 0x14B */ u8 field_0x14b;
/* 0x14C */ u8 field_0x14c;
/* 0x14D */ u8 field_0x14D[0x14E - 0x14D];
/* 0x14E */ short field_0x14e;
/* 0x150 */ short field_0x150;
/* 0x152 */ short field_0x152;
/* 0x154 */ short field_0x154;
/* 0x14E */ s16 field_0x14e;
/* 0x150 */ s16 field_0x150;
/* 0x152 */ s16 field_0x152;
/* 0x154 */ s16 field_0x154;
};
class dMeter_menuHIO_c : public JORReflexible {
@@ -196,16 +197,16 @@ public:
/* 0x1C */ f32 field_0x1c;
/* 0x20 */ f32 field_0x20;
/* 0x24 */ f32 field_0x24;
/* 0x28 */ short field_0x28;
/* 0x2A */ short field_0x2a;
/* 0x2C */ short field_0x2c;
/* 0x2E */ short field_0x2e;
/* 0x30 */ short field_0x30;
/* 0x32 */ short field_0x32;
/* 0x34 */ short field_0x34;
/* 0x36 */ short field_0x36;
/* 0x38 */ short field_0x38;
/* 0x3A */ short field_0x3a;
/* 0x28 */ s16 field_0x28;
/* 0x2A */ s16 field_0x2a;
/* 0x2C */ s16 field_0x2c;
/* 0x2E */ s16 field_0x2e;
/* 0x30 */ s16 field_0x30;
/* 0x32 */ s16 field_0x32;
/* 0x34 */ s16 field_0x34;
/* 0x36 */ s16 field_0x36;
/* 0x38 */ s16 field_0x38;
/* 0x3A */ s16 field_0x3a;
/* 0x3C */ f32 field_0x3c;
/* 0x40 */ f32 field_0x40;
/* 0x44 */ f32 field_0x44;
@@ -234,18 +235,18 @@ public:
/* 0x79 */ u8 field_0x79;
/* 0x7A */ u8 field_0x7a;
/* 0x7B */ u8 field_0x7b;
/* 0x7C */ short field_0x7c;
/* 0x7E */ short field_0x7e;
/* 0x80 */ short field_0x80;
/* 0x82 */ short field_0x82;
/* 0x84 */ short field_0x84;
/* 0x7C */ s16 field_0x7c;
/* 0x7E */ s16 field_0x7e;
/* 0x80 */ s16 field_0x80;
/* 0x82 */ s16 field_0x82;
/* 0x84 */ s16 field_0x84;
/* 0x86 */ u8 field_0x86[0x88 - 0x86];
/* 0x88 */ short field_0x88;
/* 0x8A */ short field_0x8a;
/* 0x8C */ short field_0x8c;
/* 0x8E */ short field_0x8e;
/* 0x90 */ short field_0x90;
/* 0x92 */ short field_0x92;
/* 0x88 */ s16 field_0x88;
/* 0x8A */ s16 field_0x8a;
/* 0x8C */ s16 field_0x8c;
/* 0x8E */ s16 field_0x8e;
/* 0x90 */ s16 field_0x90;
/* 0x92 */ s16 field_0x92;
/* 0x94 */ f32 field_0x94;
/* 0x98 */ u8 field_0x98;
/* 0x99 */ u8 field_0x99;
@@ -253,20 +254,20 @@ public:
/* 0x9C */ s16 field_0x9c;
/* 0x9E */ s16 field_0x9e;
/* 0xA0 */ f32 field_0xa0;
/* 0xA4 */ short field_0xa4;
/* 0xA6 */ short field_0xa6;
/* 0xA8 */ short field_0xa8;
/* 0xAA */ short field_0xaa;
/* 0xAC */ short field_0xac;
/* 0xAE */ short field_0xae;
/* 0xB0 */ short field_0xb0;
/* 0xB2 */ short field_0xb2;
/* 0xB4 */ short field_0xb4;
/* 0xB6 */ short field_0xb6;
/* 0xA4 */ s16 field_0xa4;
/* 0xA6 */ s16 field_0xa6;
/* 0xA8 */ s16 field_0xa8;
/* 0xAA */ s16 field_0xaa;
/* 0xAC */ s16 field_0xac;
/* 0xAE */ s16 field_0xae;
/* 0xB0 */ s16 field_0xb0;
/* 0xB2 */ s16 field_0xb2;
/* 0xB4 */ s16 field_0xb4;
/* 0xB6 */ s16 field_0xb6;
/* 0xB8 */ u8 field_0xb8;
/* 0xB9 */ u8 field_0xB9[0xBA - 0xB9];
/* 0xBA */ short field_0xba;
/* 0xBC */ short field_0xbc;
/* 0xBA */ s16 field_0xba;
/* 0xBC */ s16 field_0xbc;
/* 0xBE */ u8 field_0xbe;
/* 0xBF */ u8 field_0xbf;
/* 0xC0 */ u8 field_0xc0;
@@ -332,36 +333,36 @@ public:
/* 0x38 */ f32 field_0x38;
/* 0x3C */ f32 field_0x3c;
/* 0x40 */ f32 field_0x40;
/* 0x44 */ short field_0x44;
/* 0x46 */ short field_0x46;
/* 0x48 */ short field_0x48;
/* 0x4A */ short field_0x4a;
/* 0x4C */ short field_0x4c;
/* 0x44 */ s16 field_0x44;
/* 0x46 */ s16 field_0x46;
/* 0x48 */ s16 field_0x48;
/* 0x4A */ s16 field_0x4a;
/* 0x4C */ s16 field_0x4c;
/* 0x4E */ u8 field_0x4E[0x50 - 0x4E];
/* 0x50 */ f32 field_0x50;
/* 0x54 */ f32 field_0x54;
/* 0x58 */ u8 field_0x58;
/* 0x59 */ u8 field_0x59[0x5A - 0x59];
/* 0x5A */ short field_0x5a;
/* 0x5C */ short field_0x5c;
/* 0x5E */ short field_0x5e;
/* 0x60 */ short field_0x60;
/* 0x62 */ short field_0x62;
/* 0x5A */ s16 field_0x5a;
/* 0x5C */ s16 field_0x5c;
/* 0x5E */ s16 field_0x5e;
/* 0x60 */ s16 field_0x60;
/* 0x62 */ s16 field_0x62;
/* 0x64 */ u8 field_0x64;
/* 0x65 */ u8 field_0x65[0x66 - 0x65];
/* 0x66 */ short field_0x66;
/* 0x68 */ short field_0x68;
/* 0x6A */ short field_0x6a;
/* 0x6C */ short field_0x6c;
/* 0x6E */ short field_0x6e;
/* 0x70 */ short field_0x70;
/* 0x66 */ s16 field_0x66;
/* 0x68 */ s16 field_0x68;
/* 0x6A */ s16 field_0x6a;
/* 0x6C */ s16 field_0x6c;
/* 0x6E */ s16 field_0x6e;
/* 0x70 */ s16 field_0x70;
/* 0x72 */ u8 field_0x72;
/* 0x73 */ u8 field_0x73[0x74 - 0x73];
/* 0x74 */ short field_0x74;
/* 0x76 */ short field_0x76;
/* 0x78 */ short field_0x78;
/* 0x7A */ short field_0x7a;
/* 0x7C */ short field_0x7c;
/* 0x74 */ s16 field_0x74;
/* 0x76 */ s16 field_0x76;
/* 0x78 */ s16 field_0x78;
/* 0x7A */ s16 field_0x7a;
/* 0x7C */ s16 field_0x7c;
/* 0x7E */ u8 field_0x7e;
/* 0x7F */ u8 field_0x7f;
/* 0x80 */ u8 field_0x80;
@@ -432,18 +433,18 @@ public:
/* 0x31 */ u8 field_0x31;
/* 0x32 */ u8 field_0x32;
/* 0x33 */ u8 field_0x33[0x34 - 0x33];
/* 0x34 */ short field_0x34;
/* 0x36 */ short field_0x36;
/* 0x38 */ short field_0x38;
/* 0x34 */ s16 field_0x34;
/* 0x36 */ s16 field_0x36;
/* 0x38 */ s16 field_0x38;
/* 0x3A */ u8 field_0x3a;
/* 0x3B */ u8 field_0x3b;
/* 0x3C */ short field_0x3c;
/* 0x3C */ s16 field_0x3c;
/* 0x3E */ u8 field_0x3E[0x40 - 0x3E];
/* 0x40 */ f32 field_0x40;
/* 0x44 */ u8 field_0x44;
/* 0x45 */ u8 field_0x45[0x46 - 0x45];
/* 0x46 */ short field_0x46;
/* 0x48 */ short field_0x48;
/* 0x46 */ s16 field_0x46;
/* 0x48 */ s16 field_0x48;
/* 0x4A */ u8 field_0x4a;
/* 0x4B */ u8 field_0x4b;
/* 0x4C */ u8 field_0x4c;
@@ -454,34 +455,34 @@ public:
/* 0x51 */ u8 field_0x51;
/* 0x52 */ u8 field_0x52;
/* 0x53 */ u8 field_0x53;
/* 0x54 */ short field_0x54;
/* 0x56 */ short field_0x56;
/* 0x58 */ short field_0x58;
/* 0x54 */ s16 field_0x54;
/* 0x56 */ s16 field_0x56;
/* 0x58 */ s16 field_0x58;
/* 0x5A */ u8 field_0x5a;
/* 0x5B */ u8 field_0x5b;
/* 0x5C */ u8 field_0x5c;
/* 0x5D */ u8 field_0x5d;
/* 0x5E */ u8 field_0x5e;
/* 0x5F */ u8 field_0x5F[0x60 - 0x5F];
/* 0x60 */ short field_0x60;
/* 0x62 */ short field_0x62;
/* 0x64 */ short field_0x64;
/* 0x66 */ short field_0x66;
/* 0x68 */ short field_0x68;
/* 0x6A */ short field_0x6a;
/* 0x6C */ short field_0x6c;
/* 0x6E */ short field_0x6e;
/* 0x70 */ short field_0x70;
/* 0x72 */ short field_0x72;
/* 0x74 */ short field_0x74;
/* 0x76 */ short field_0x76;
/* 0x60 */ s16 field_0x60;
/* 0x62 */ s16 field_0x62;
/* 0x64 */ s16 field_0x64;
/* 0x66 */ s16 field_0x66;
/* 0x68 */ s16 field_0x68;
/* 0x6A */ s16 field_0x6a;
/* 0x6C */ s16 field_0x6c;
/* 0x6E */ s16 field_0x6e;
/* 0x70 */ s16 field_0x70;
/* 0x72 */ s16 field_0x72;
/* 0x74 */ s16 field_0x74;
/* 0x76 */ s16 field_0x76;
/* 0x78 */ u8 field_0x78;
/* 0x79 */ u8 field_0x79[0x7A - 0x79];
/* 0x7A */ short field_0x7a;
/* 0x7C */ short field_0x7c;
/* 0x7E */ short field_0x7e;
/* 0x80 */ short field_0x80;
/* 0x82 */ short field_0x82;
/* 0x7A */ s16 field_0x7a;
/* 0x7C */ s16 field_0x7c;
/* 0x7E */ s16 field_0x7e;
/* 0x80 */ s16 field_0x80;
/* 0x82 */ s16 field_0x82;
};
class dDlst_2DMETER1_c : public dDlst_base_c {
@@ -507,12 +508,12 @@ public:
/* 0x05 */ u8 field_0x5;
/* 0x06 */ u8 field_0x6;
/* 0x07 */ u8 field_0x7;
/* 0x08 */ short field_0x8;
/* 0x0A */ short field_0xa;
/* 0x0C */ short field_0xc;
/* 0x08 */ s16 field_0x8;
/* 0x0A */ s16 field_0xa;
/* 0x0C */ s16 field_0xc;
/* 0x10 */ f32 field_0x10;
/* 0x14 */ short field_0x14;
/* 0x16 */ short field_0x16;
/* 0x14 */ s16 field_0x14;
/* 0x16 */ s16 field_0x16;
/* 0x18 */ u8 field_0x18[0x20 - 0x18];
};
@@ -537,7 +538,7 @@ public:
/* 0x00 */ u8 field_0x0;
/* 0x01 */ u8 field_0x1;
/* 0x02 */ u8 field_0x2;
/* 0x04 */ short field_0x4;
/* 0x04 */ s16 field_0x4;
};
class dMeter_info_c {
@@ -648,19 +649,19 @@ public:
/* 0x1E88 */ fopMsgM_pane_class field_0x1e88;
/* 0x1EC0 */ fopMsgM_pane_class field_0x1ec0;
/* 0x1EF8 */ fopMsgM_pane_class field_0x1ef8;
/* 0x1F30 */ fopMsgM_pane_class field_0x1f30[3];
/* 0x1FD8 */ fopMsgM_pane_class field_0x1fd8[3];
/* 0x2080 */ fopMsgM_pane_class field_0x2080[3];
/* 0x2128 */ fopMsgM_pane_class field_0x2128[3];
/* 0x1F30 */ fopMsgM_pane_class field_0x1f30[dItemBtn_COUNT_e];
/* 0x1FD8 */ fopMsgM_pane_class field_0x1fd8[dItemBtn_COUNT_e];
/* 0x2080 */ fopMsgM_pane_class field_0x2080[dItemBtn_COUNT_e];
/* 0x2128 */ fopMsgM_pane_class field_0x2128[dItemBtn_COUNT_e];
/* 0x21D0 */ fopMsgM_pane_class field_0x21d0;
/* 0x2208 */ fopMsgM_pane_class field_0x2208;
/* 0x2240 */ fopMsgM_pane_class field_0x2240;
/* 0x2278 */ fopMsgM_pane_class field_0x2278;
/* 0x22B0 */ fopMsgM_pane_class field_0x22b0;
/* 0x22E8 */ fopMsgM_pane_class field_0x22e8;
/* 0x2320 */ fopMsgM_pane_class field_0x2320[3];
/* 0x23C8 */ fopMsgM_pane_class field_0x23c8[3];
/* 0x2470 */ fopMsgM_pane_class field_0x2470[3];
/* 0x2320 */ fopMsgM_pane_class field_0x2320[dItemBtn_COUNT_e];
/* 0x23C8 */ fopMsgM_pane_class field_0x23c8[dItemBtn_COUNT_e];
/* 0x2470 */ fopMsgM_pane_class field_0x2470[dItemBtn_COUNT_e];
/* 0x2518 */ fopMsgM_pane_class field_0x2518;
/* 0x2550 */ fopMsgM_pane_class field_0x2550[2];
/* 0x25C0 */ fopMsgM_pane_class field_0x25c0[2];
@@ -752,7 +753,7 @@ public:
/* 0x301E */ u8 mMaxHP;
/* 0x301F */ u8 mCurrHP;
/* 0x3020 */ u8 field_0x3020;
/* 0x3021 */ u8 field_0x3021[3];
/* 0x3021 */ u8 field_0x3021[dItemBtn_COUNT_e];
/* 0x3024 */ u8 field_0x3024;
/* 0x3025 */ s8 field_0x3025;
/* 0x3026 */ u8 field_0x3026;
include/f_op/f_op_actor.h
+6 -6
View File
@@ -180,22 +180,22 @@ public:
void setCommand(u16 command) { mCommand = command; }
void setXyEventCB(CallbackFunc cb) { mpEventCB = cb; }
s16 runXyEventCB(void* ac, int i_itemBtn) {
s16 runXyEventCB(void* i_actor, int i_itemBtn) {
if (mpEventCB == NULL)
return -1;
return mpEventCB(ac, i_itemBtn);
return mpEventCB(i_actor, i_itemBtn);
}
void setXyCheckCB(CallbackFunc cb) { mpCheckCB = cb; }
s16 runXyCheckCB(void* ac, int i_itemBtn) {
s16 runXyCheckCB(void* i_actor, int i_itemBtn) {
if (mpCheckCB == NULL)
return true;
return mpCheckCB(ac, i_itemBtn);
return mpCheckCB(i_actor, i_itemBtn);
}
void setPhotoEventCB(CallbackFunc cb) { mpPhotoCB = cb; }
s16 runPhotoEventCB(void* ac, int i_itemBtn) {
s16 runPhotoEventCB(void* i_actor, int i_itemBtn) {
if (mpPhotoCB == NULL)
return -1;
return mpPhotoCB(ac, i_itemBtn);
return mpPhotoCB(i_actor, i_itemBtn);
}
public:
src/c/c_dylink.cpp
+2 -2
View File
@@ -25,7 +25,7 @@ bool DMC_initialized = false;
volatile BOOL cDyl_Initialized = false;
mDoDvdThd_callback_c * cDyl_DVD = NULL;
const DynamicNameTableEntry DynamicNameTable[] = {
const cDyl_DynamicName_t DynamicNameTable[] = {
{PROC_ALLDIE, "d_a_alldie"},
{PROC_TAG_EVSW, "d_a_tag_evsw"},
{PROC_Obj_Swpush, "d_a_obj_swpush"},
@@ -478,7 +478,7 @@ BOOL cCc_Init() {
memset(DMC, 0, sizeof(DMC));
for (int i = 0; i < ARRAY_SIZE(DynamicNameTable); i++) {
const DynamicNameTableEntry & d = DynamicNameTable[i];
const cDyl_DynamicName_t & d = DynamicNameTable[i];
if (d.name == NULL)
continue;
src/d/actor/d_a_arrow_iceeff.cpp
+2 -2
View File
@@ -79,10 +79,10 @@ void daArrow_Iceeff_c::CreateInit() {
field_0xA30 = 0;
field_0xA34 = 0.0f;
if(field_0xA38 == 0) {
field_0xA1C = daPy_getPlayerLinkActorClass()->mpGicer00Btk;
field_0xA1C = daPy_getPlayerLinkActorClass()->getIceParticleBtk();
}
else {
field_0xA1C = daPy_getPlayerLinkActorClass()->mpGicer01Btk;
field_0xA1C = daPy_getPlayerLinkActorClass()->getIceWaterParticleBtk();
}
field_0xA1C->setFrame(field_0xA34);
src/d/actor/d_a_boomerang.cpp
+1 -4
View File
@@ -548,10 +548,7 @@ BOOL daBoomerang_c::procWait() {
if (dCam_getBody()->mCurMode != 0xB) {
resetLockActor();
} else {
bool isAiming = (pPlayer->mCurProc == daPy_lk_c::daPyProc_BOOMERANG_SUBJECT_e || pPlayer->mCurProc == daPy_lk_c::daPyProc_SHIP_BOOMERANG_e) &&
pPlayer->mSightPacket.getDrawFlg();
if (isAiming) {
if (pPlayer->checkBoomerangRock()) {
camera_class* pCamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
cXyz eyePos = *fopCamM_GetEye_p(pCamera);
cXyz topPos = pPlayer->getLineTopPos();
src/d/actor/d_a_dai.cpp
+12 -14
View File
@@ -207,35 +207,33 @@ void daDai_c::checkOrder() {
}
/* 00000AFC-00000B1C .text daDai_XyCheckCB__FPvi */
static s16 daDai_XyCheckCB(void* v_this, int arg1) {
return ((daDai_c*)v_this)->XyCheckCB(arg1);
static s16 daDai_XyCheckCB(void* i_this, int i_itemBtn) {
return ((daDai_c*)i_this)->XyCheckCB(i_itemBtn);
}
/* 00000B1C-00000BA8 .text XyCheckCB__7daDai_cFi */
s16 daDai_c::XyCheckCB(int arg1) {
u8 item = dComIfGp_getSelectItem(arg1);
s16 daDai_c::XyCheckCB(int i_itemBtn) {
u8 itemNo = dComIfGp_getSelectItem(i_itemBtn);
if (isDaizaItem(item) && !dComIfGs_getEventReg(m_savelabel[mSaveID])) {
m84A = item;
if (isDaizaItem(itemNo) && !dComIfGs_getEventReg(m_savelabel[mSaveID])) {
m84A = itemNo;
return 1;
}
return 0;
}
/* 00000BA8-00000BC8 .text daDai_XyEventCB__FPvi */
static s16 daDai_XyEventCB(void* v_this, int arg1) {
return ((daDai_c*)v_this)->XyEventCB(arg1);
static s16 daDai_XyEventCB(void* i_this, int i_itemBtn) {
return ((daDai_c*)i_this)->XyEventCB(i_itemBtn);
}
/* 00000BC8-00000C18 .text XyEventCB__7daDai_cFi */
s16 daDai_c::XyEventCB(int arg1) {
s16 sVar1;
if (isDaizaItem(dComIfGp_getSelectItem(arg1))) {
sVar1 = mEvtDaiItemIdx;
s16 daDai_c::XyEventCB(int i_itemBtn) {
if (isDaizaItem(dComIfGp_getSelectItem(i_itemBtn))) {
return mEvtDaiItemIdx;
} else {
sVar1 = mEvtDefaultTalkIdx;
return mEvtDefaultTalkIdx;
}
return sVar1;
}
/* 00000C18-00000C78 .text _execute__7daDai_cFv */
src/d/actor/d_a_daiocta.cpp
+1 -1
View File
@@ -1202,7 +1202,7 @@ void daDaiocta_c::modeDemo() {
mDoAud_subBgmStop();
#endif
if (m575 == 0xFF) {
daPy_getPlayerLinkActorClass()->startRestartRoom(6, 0xC9, -1.0f, 1);
daPy_getPlayerLinkActorClass()->setDaiokutaEnd();
} else {
dComIfGp_setNextStage(
dComIfGp_getStartStageName(),
src/d/actor/d_a_demo_item.cpp
+1 -1
View File
@@ -91,7 +91,7 @@ u8 daDitem_c::m_effect_type[0x100] = {
0x01, // dItem_SKULL_NECKLACE_e
0x01, // dItem_BOKOBABA_SEED_e
0x01, // dItem_GOLDEN_FEATHER_e
0x01, // BOKO_BELT
0x01, // dItem_KNIGHTS_CREST_e
0x01, // dItem_RED_JELLY_e
0x01, // dItem_GREEN_JELLY_e
0x01, // dItem_BLUE_JELLY_e
src/d/actor/d_a_item.cpp
+19 -19
View File
@@ -34,7 +34,7 @@ cXyz setArrowTrans(s16 yRot, cXyz offset) {
/* 800F4C4C-800F4CD8 .text getYOffset__8daItem_cFv */
float daItem_c::getYOffset() {
switch (m_itemNo) {
case BOKO_BELT:
case dItem_KNIGHTS_CREST_e:
return 0.0f;
case dItem_SKULL_NECKLACE_e:
return 0.0f;
@@ -655,9 +655,9 @@ void daItem_c::itemGetExecute() {
break;
case dItem_JOY_PENDANT_e:
mDoAud_seStart(JA_SE_SPOILS_GET);
if (!dComIfGs_isGetItemBeast(7)) {
if (!dComIfGs_isGetItemBeast(dBeastIdx_JOY_PENDANT_e)) {
mItemStatus = STATUS_INIT_GET_DEMO;
dComIfGs_onGetItemBeast(7);
dComIfGs_onGetItemBeast(dBeastIdx_JOY_PENDANT_e);
} else {
execItemGet(m_itemNo);
}
@@ -686,63 +686,63 @@ void daItem_c::itemGetExecute() {
break;
case dItem_SKULL_NECKLACE_e:
mDoAud_seStart(JA_SE_SPOILS_GET);
if (!dComIfGs_isGetItemBeast(0)) {
if (!dComIfGs_isGetItemBeast(dBeastIdx_SKULL_NECKLACE_e)) {
mItemStatus = STATUS_INIT_GET_DEMO;
dComIfGs_onGetItemBeast(0);
dComIfGs_onGetItemBeast(dBeastIdx_SKULL_NECKLACE_e);
} else {
execItemGet(m_itemNo);
}
break;
case dItem_BOKOBABA_SEED_e:
mDoAud_seStart(JA_SE_SPOILS_GET);
if (!dComIfGs_isGetItemBeast(1)) {
if (!dComIfGs_isGetItemBeast(dBeastIdx_BOKOBABA_SEED_e)) {
mItemStatus = STATUS_INIT_GET_DEMO;
dComIfGs_onGetItemBeast(1);
dComIfGs_onGetItemBeast(dBeastIdx_BOKOBABA_SEED_e);
} else {
execItemGet(m_itemNo);
}
break;
case dItem_GOLDEN_FEATHER_e:
mDoAud_seStart(JA_SE_SPOILS_GET);
if (!dComIfGs_isGetItemBeast(2)) {
if (!dComIfGs_isGetItemBeast(dBeastIdx_GOLDEN_FEATHER_e)) {
mItemStatus = STATUS_INIT_GET_DEMO;
dComIfGs_onGetItemBeast(2);
dComIfGs_onGetItemBeast(dBeastIdx_GOLDEN_FEATHER_e);
} else {
execItemGet(m_itemNo);
}
break;
case BOKO_BELT:
case dItem_KNIGHTS_CREST_e:
mDoAud_seStart(JA_SE_SPOILS_GET);
if (!dComIfGs_isGetItemBeast(3)) {
if (!dComIfGs_isGetItemBeast(dBeastIdx_KNIGHTS_CREST_e)) {
mItemStatus = STATUS_INIT_GET_DEMO;
dComIfGs_onGetItemBeast(3);
dComIfGs_onGetItemBeast(dBeastIdx_KNIGHTS_CREST_e);
} else {
execItemGet(m_itemNo);
}
break;
case dItem_RED_JELLY_e:
mDoAud_seStart(JA_SE_SPOILS_GET);
if (!dComIfGs_isGetItemBeast(4)) {
if (!dComIfGs_isGetItemBeast(dBeastIdx_RED_JELLY_e)) {
mItemStatus = STATUS_INIT_GET_DEMO;
dComIfGs_onGetItemBeast(4);
dComIfGs_onGetItemBeast(dBeastIdx_RED_JELLY_e);
} else {
execItemGet(m_itemNo);
}
break;
case dItem_GREEN_JELLY_e:
mDoAud_seStart(JA_SE_SPOILS_GET);
if (!dComIfGs_isGetItemBeast(5)) {
if (!dComIfGs_isGetItemBeast(dBeastIdx_GREEN_JELLY_e)) {
mItemStatus = STATUS_INIT_GET_DEMO;
dComIfGs_onGetItemBeast(5);
dComIfGs_onGetItemBeast(dBeastIdx_GREEN_JELLY_e);
} else {
execItemGet(m_itemNo);
}
break;
case dItem_BLUE_JELLY_e:
mDoAud_seStart(JA_SE_SPOILS_GET);
if (!dComIfGs_isGetItemBeast(6)) {
if (!dComIfGs_isGetItemBeast(dBeastIdx_BLUE_JELLY_e)) {
mItemStatus = STATUS_INIT_GET_DEMO;
dComIfGs_onGetItemBeast(6);
dComIfGs_onGetItemBeast(dBeastIdx_BLUE_JELLY_e);
} else {
execItemGet(m_itemNo);
}
@@ -1288,7 +1288,7 @@ void daItem_c::mode_wait() {
case dItem_SKULL_NECKLACE_e:
case dItem_BOKOBABA_SEED_e:
case dItem_GOLDEN_FEATHER_e:
case BOKO_BELT:
case dItem_KNIGHTS_CREST_e:
case dItem_RED_JELLY_e:
case dItem_GREEN_JELLY_e:
case dItem_BLUE_JELLY_e:
src/d/actor/d_a_npc_bs1.cpp
+18 -18
View File
@@ -394,28 +394,28 @@ static u32 daNpc_Bs1_getBuyItemMax(int i_itemCost, int i_itemNo) {
int beastIdx;
switch (i_itemNo) {
case dItem_BOKOBABA_SEED_e:
beastIdx = 1;
beastIdx = dBeastIdx_BOKOBABA_SEED_e;
break;
case dItem_SKULL_NECKLACE_e:
beastIdx = 0;
beastIdx = dBeastIdx_SKULL_NECKLACE_e;
break;
case dItem_RED_JELLY_e:
beastIdx = 4;
beastIdx = dBeastIdx_RED_JELLY_e;
break;
case dItem_GREEN_JELLY_e:
beastIdx = 5;
beastIdx = dBeastIdx_GREEN_JELLY_e;
break;
case dItem_BLUE_JELLY_e:
beastIdx = 6;
beastIdx = dBeastIdx_BLUE_JELLY_e;
break;
case dItem_JOY_PENDANT_e:
beastIdx = 7;
beastIdx = dBeastIdx_JOY_PENDANT_e;
break;
case dItem_GOLDEN_FEATHER_e:
beastIdx = 2;
beastIdx = dBeastIdx_GOLDEN_FEATHER_e;
break;
default:
beastIdx = 3;
beastIdx = dBeastIdx_KNIGHTS_CREST_e;
break;
}
@@ -580,35 +580,35 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) {
}
if(l_msg->mSelectNum == 0) {
int idx;
int beastIdx;
switch(*pMsgNo) {
case 0xF7C:
idx = 1;
beastIdx = dBeastIdx_BOKOBABA_SEED_e;
break;
case 0xF84:
idx = 0;
beastIdx = dBeastIdx_SKULL_NECKLACE_e;
break;
case 0xF89:
idx = 4;
beastIdx = dBeastIdx_RED_JELLY_e;
break;
case 0xF8E:
idx = 5;
beastIdx = dBeastIdx_GREEN_JELLY_e;
break;
case 0xF93:
idx = 6;
beastIdx = dBeastIdx_BLUE_JELLY_e;
break;
case 0xF98:
idx = 7;
beastIdx = dBeastIdx_JOY_PENDANT_e;
break;
case 0xF9D:
idx = 2;
beastIdx = dBeastIdx_GOLDEN_FEATHER_e;
break;
case 0xFD3:
idx = 3;
beastIdx = dBeastIdx_KNIGHTS_CREST_e;
break;
}
dComIfGp_setItemRupeeCount(getPayRupee());
dComIfGp_setItemBeastNumCount(idx, -getBuyItem());
dComIfGp_setItemBeastNumCount(beastIdx, -getBuyItem());
if(*pMsgNo == 0xFD3) {
u8 r3 = dComIfGs_getEventReg(dSv_event_flag_c::UNK_7F0F);
src/d/actor/d_a_npc_btsw.cpp
+2 -2
View File
@@ -451,8 +451,8 @@ void daNpc_Btsw_c::anmAtr(u16 i_msgStatus) {
}
/* 00000F0C-00000F30 .text daNpc_Btsw_XyCheckCB__FPvi */
static s16 daNpc_Btsw_XyCheckCB(void*, int idx) {
if (dComIfGp_getSelectItem(idx) == dItem_NOTE_TO_MOM_e) {
static s16 daNpc_Btsw_XyCheckCB(void*, int i_itemBtn) {
if (dComIfGp_getSelectItem(i_itemBtn) == dItem_NOTE_TO_MOM_e) {
return TRUE;
}
return FALSE;
src/d/actor/d_a_npc_ji1.cpp
+7 -7
View File
@@ -233,7 +233,7 @@ daNpc_Ji1_HIO_c::daNpc_Ji1_HIO_c() {
/* 000003C0-000003E4 .text daNpc_Ji1_XyCheckCB__FPvi */
static s16 daNpc_Ji1_XyCheckCB(void*, int i_itemBtn) {
return dComIfGp_getSelectItem(i_itemBtn) == BOKO_BELT ? TRUE : FALSE;
return dComIfGp_getSelectItem(i_itemBtn) == dItem_KNIGHTS_CREST_e ? TRUE : FALSE;
}
/* 000003E4-00000404 .text daJi1_CoHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
@@ -848,11 +848,11 @@ u32 daNpc_Ji1_c::getMsg2ndType() {
msgNo = 0x9AE;
}
#if VERSION == VERSION_DEMO
else if(dComIfGs_getBeastNum(3) < 3) {
else if(dComIfGs_getBeastNum(dBeastIdx_KNIGHTS_CREST_e) < 3) {
msgNo = 0x9BB;
}
#else
else if(dComIfGs_getBeastNum(3) < 10) {
else if(dComIfGs_getBeastNum(dBeastIdx_KNIGHTS_CREST_e) < 10) {
msgNo = 0x9BB;
}
#endif
@@ -953,12 +953,12 @@ u16 daNpc_Ji1_c::next_msgStatus(u32* pMsgNo) {
break;
case 0x9AF:
#if VERSION == VERSION_DEMO
if(dComIfGs_getBeastNum(3) >= 3) {
dComIfGp_setItemBeastNumCount(3, -3);
if(dComIfGs_getBeastNum(dBeastIdx_KNIGHTS_CREST_e) >= 3) {
dComIfGp_setItemBeastNumCount(dBeastIdx_KNIGHTS_CREST_e, -3);
mMsgNo = 0x9B0;
}
#else
if(dComIfGs_getBeastNum(3) >= 10) {
if(dComIfGs_getBeastNum(dBeastIdx_KNIGHTS_CREST_e) >= 10) {
mMsgNo = 0x9B0;
}
#endif
@@ -3043,7 +3043,7 @@ BOOL daNpc_Ji1_c::teachSPRollCutAction(void*) {
dComIfGs_onEventBit(dSv_event_flag_c::UNK_0B20);
dComIfGs_offTmpBit(dSv_event_tmp_flag_c::UNK_0402);
#if VERSION > VERSION_DEMO
dComIfGp_setItemBeastNumCount(3, -10);
dComIfGp_setItemBeastNumCount(dBeastIdx_KNIGHTS_CREST_e, -10);
#endif
field_0x7E0.OffTgShield();
field_0xC84 = 10;
src/d/actor/d_a_npc_people.cpp
+1 -1
View File
@@ -6584,7 +6584,7 @@ u16 daNpcPeople_c::next_msgStatus(u32* pMsgNo) {
}
else {
m734 = l_msg_xy_sa5_yes;
dComIfGp_setItemBeastNumCount(0x0, -3);
dComIfGp_setItemBeastNumCount(dBeastIdx_SKULL_NECKLACE_e, -3);
dComIfGp_resetItemTimer(0xE10);
mEtcFlag |= 0x100000;
}
src/d/actor/d_a_obj_mknjd.cpp
+2 -2
View File
@@ -142,8 +142,8 @@ static BOOL nodeCallBack_Hahen(J3DNode* i_node, int calcTiming) {
}
/* 000002B0-000002D0 .text daObjMknjD_XyCheckCB__FPvi */
static s16 daObjMknjD_XyCheckCB(void* i_this, int i_param2) {
return static_cast<daObjMknjD::Act_c*>(i_this)->XyCheckCB(i_param2);
static s16 daObjMknjD_XyCheckCB(void* i_this, int i_itemBtn) {
return static_cast<daObjMknjD::Act_c*>(i_this)->XyCheckCB(i_itemBtn);
}
/* 000002D0-000002F0 .text daObjMknjD_XyEventCB__FPvi */
src/d/actor/d_a_player_battle.inc
+1 -1
View File
@@ -263,7 +263,7 @@ BOOL daPy_lk_c::procBtRoll_init(fopEn_enemy_c* enemy) {
m34D6 = cM_atan2s(local_2c.x, local_2c.z);
shape_angle.y = fopAcM_searchActorAngleY(this, enemy);
dComIfGp_setPlayerStatus0(0, daPyStts0_UNK2_e);
m34BE = 4;
setFootEffectPosType(4);
voiceStart(7);
endFlameDamageEmitter();
return true;
src/d/actor/d_a_player_boomerang.inc
+2 -2
View File
@@ -50,7 +50,7 @@ void daPy_lk_c::throwBoomerang() {
BOOL daPy_lk_c::returnBoomerang() {
dComIfGp_clearPlayerStatus0(0, daPyStts0_BOOMERANG_WAIT_e);
if (mEquipItem == daPyItem_NONE_e && !checkNoControll() && !dComIfGp_event_runCheck() && mDemo.getDemoType() == 0 &&
if (mEquipItem == daPyItem_NONE_e && !checkNoControll() && !dComIfGp_event_runCheck() && !checkPlayerDemoMode() &&
(checkNoUpperAnime() || checkPlayerGuard() || checkDashDamageAnime() || checkBoomerangAnime()) &&
(!checkModeFlg(
// These combine to: 0x01FD2810
@@ -113,7 +113,7 @@ BOOL daPy_lk_c::checkNextBoomerangMode() {
/* 80149964-80149A44 .text changeBoomerangCatchProc__9daPy_lk_cFv */
BOOL daPy_lk_c::changeBoomerangCatchProc() {
if (checkNoResetFlg0(daPyFlg0_UNK20)) {
if (!dComIfGp_event_runCheck() && mDemo.getDemoType() == 0 && checkModeFlg(ModeFlg_00020000) &&
if (!dComIfGp_event_runCheck() && !checkPlayerDemoMode() && checkModeFlg(ModeFlg_00020000) &&
(checkNoUpperAnime() || checkBoomerangThrowAnime()))
{
setActAnimeUpper(
src/d/actor/d_a_player_bottle.inc
+7 -7
View File
@@ -98,7 +98,7 @@ BOOL daPy_lk_c::procBottleDrink_init(u16 param_0) {
return false;
}
mDemo.setDemoType(5);
mDemo.setSpecialDemoType();
int iVar1 = checkShipRideUseItem(1);
commonProcInit(daPyProc_BOTTLE_DRINK_e);
current.angle.y = shape_angle.y;
@@ -213,7 +213,7 @@ BOOL daPy_lk_c::procBottleOpen_init(u16 param_0) {
if (!dComIfGp_event_compulsory(this)) {
return false;
}
mDemo.setDemoType(5);
mDemo.setSpecialDemoType();
} else {
param_0 = dComIfGp_event_getPreItemNo();
}
@@ -352,7 +352,7 @@ BOOL daPy_lk_c::procBottleOpen() {
}
if (frameCtrl.getRate() < 0.01f) {
mActorKeepRope.clearData();
if (mDemo.getDemoType() == 5) {
if (checkSpecialDemoMode()) {
dCam_getBody()->EndEventCamera(fopAcM_GetID(this));
dComIfGp_event_reset();
endDemoMode();
@@ -381,7 +381,7 @@ BOOL daPy_lk_c::procBottleOpen() {
) {
mpBottleContentsModel = NULL;
m34D8 = 1;
if (mDemo.getDemoType() == 5) {
if (checkSpecialDemoMode()) {
dComIfGs_setEquipBottleItemEmpty(mReadyItemBtn);
} else if (dComIfGp_event_getTalkXYBtn() == dTalkBtn_X_e) {
dComIfGs_setEquipBottleItemEmpty(dItemBtn_X_e);
@@ -436,7 +436,7 @@ BOOL daPy_lk_c::procBottleSwing_init(int param_0) {
} else {
bVar1 = true;
}
} else if (m35D0 > 10.0f + current.pos.y) {
} else if (mWaterY > 10.0f + current.pos.y) {
bVar1 = true;
} else {
bVar1 = false;
@@ -493,11 +493,11 @@ BOOL daPy_lk_c::procBottleSwing() {
dComIfGs_setEquipBottleItemIn(mReadyItemBtn, mEquipItem);
m355E = 0;
}
mDemo.setDemoType(5);
mDemo.setSpecialDemoType();
} else {
if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() >= 1.0f &&
mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() <= 4.0f && getReadyItem() == dItem_EMPTY_BOTTLE_e &&
(dComIfGp_att_getCatghTarget() != NULL || m35D0 > current.pos.y + 10.0f))
(dComIfGp_att_getCatghTarget() != NULL || mWaterY > current.pos.y + 10.0f))
{
fopAcM_orderCatchEvent(this, dComIfGp_att_getCatghTarget());
}
src/d/actor/d_a_player_crawl.inc
+4 -4
View File
@@ -241,13 +241,13 @@ void daPy_lk_c::setDoStatusCrawl() {
dComIfGp_setRStatus(dActStts_CROUCH_e);
if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x80)) {
dComIfGp_setAStatus(dActStts_RETURN_e);
if (checkSubjectEnd(1) || m35D0 > current.pos.y) {
if (checkSubjectEnd(1) || mWaterY > current.pos.y) {
dComIfGp_clearPlayerStatus0(0, daPyStts0_UNK2000_e);
} else {
dComIfGp_setPlayerStatus0(0, daPyStts0_UNK2000_e);
}
} else if (dCam_getBody()->ChangeModeOK(4)) {
if (m35D0 <= current.pos.y) {
if (mWaterY <= current.pos.y) {
onResetFlg0(daPyRFlg0_SUBJECT_ACCEPT);
if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x1000) && !dComIfGp_event_runCheck()) {
setSubjectMode();
@@ -297,7 +297,7 @@ BOOL daPy_lk_c::procCrawlStart() {
local_20.y = 50.0f;
mDoMtx_multVec(mpCLModel->getBaseTRMtx(), &local_20, &cStack_38);
crawlBgCheck(&cStack_38, &cStack_38);
if (!spActionButton() || m35D0 > 15.0f + current.pos.y) {
if (!spActionButton() || checkCrawlWaterIn()) {
procCrawlEnd_init(0, shape_angle.x, shape_angle.z);
} else if (mStickDistance > 0.05f &&
((mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) ||
@@ -410,7 +410,7 @@ BOOL daPy_lk_c::procCrawlMove() {
bVar5 = true;
offModeFlg(ModeFlg_04000000);
}
if ((bVar5 != false && !spActionButton()) || (getSlidePolygon() != NULL || m35D0 > current.pos.y + 15.0f)) {
if ((bVar5 != false && !spActionButton()) || getSlidePolygon() != NULL || checkCrawlWaterIn()) {
procCrawlEnd_init(1, shape_angle.x, shape_angle.z);
} else {
bVar4 = false;
src/d/actor/d_a_player_dproc.inc
+5 -5
View File
@@ -846,7 +846,7 @@ void daPy_lk_c::dProcLavaDamage_init_sub() {
voiceStart(4);
seStartMapInfo(JA_SE_LK_FALL_MAGMA);
gravity = m_HIO->mAutoJump.m.field_0xC;
mDemo.setDemoType(5);
mDemo.setSpecialDemoType();
dComIfGp_setPlayerStatus0(0, daPyStts0_UNK10000000_e);
daPy_py_c::changePlayer(this);
}
@@ -896,7 +896,7 @@ void daPy_lk_c::dProcFreezeDamage_init_sub(int param_0) {
if (param_0 != 0) {
mProcVar0.m3570 = 1;
mDemo.setDemoType(5);
mDemo.setSpecialDemoType();
daPy_py_c::changePlayer(this);
}
endDamageEmitter();
@@ -952,7 +952,7 @@ void daPy_lk_c::dProcDead_init_sub() {
mProcVar0.m3570 = 0;
dComIfGp_setPlayerStatus0(0, daPyStts0_UNK20000000_e);
m3628 = fopMsgM_create(PROC_GAMEOVER);
mDemo.setDemoType(5);
mDemo.setSpecialDemoType();
daPy_py_c::changePlayer(this);
}
@@ -1110,7 +1110,7 @@ BOOL daPy_lk_c::dProcDead() {
if (!dComIfGp_checkPlayerStatus0(0, (daPyStts0_SHIP_RIDE_e | daPyStts0_SWIM_e))) {
if (frameCtrl.checkPass(129.0f)) {
voiceStart(0x17);
m34BE = 6;
setFootEffectPosType(6);
} else {
if (frameCtrl.getFrame() >= 129.0f) {
resetFootEffect();
@@ -2419,7 +2419,7 @@ BOOL daPy_lk_c::dProcLastCombo_init() {
m35E8 = m35EC = 0.0f;
bck = (J3DAnmTransform*)(dComIfG_getObjectRes(l_arcName, LINK_BCK_COMBO_TATE));
mAtngshaBck.init(mpShmsModel->getModelData(), bck, false, J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, true);
m34BE = 4;
setFootEffectPosType(4);
offNoResetFlg1(daPyFlg1_LAST_COMBO_WAIT);
setBlurPosResource(LKANM__LASTCOMBO_POS);
mProcVar0.m3570 = 1;
src/d/actor/d_a_player_food.inc
+6 -6
View File
@@ -97,7 +97,7 @@ BOOL daPy_lk_c::procFoodThrow_init() {
);
keepItemData();
if (mDemo.getDemoType() == 5) {
if (checkSpecialDemoMode()) {
mProcVar0.m3570 = 6;
dCam_getBody()->StartEventCamera(0x12, fopAcM_GetID(this), "Type", &mProcVar0.m3570, 0);
}
@@ -113,7 +113,7 @@ BOOL daPy_lk_c::procFoodThrow() {
J3DFrameCtrl& frameCtrl = mFrameCtrlUnder[UNDER_MOVE0_e];
setShipRidePosUseItem();
if (frameCtrl.getRate() < 0.01f) {
if (mDemo.getDemoType() != 5) {
if (!checkSpecialDemoMode()) {
dComIfGp_evmng_cutEnd(mStaffIdx);
} else {
dComIfGp_event_reset();
@@ -126,7 +126,7 @@ BOOL daPy_lk_c::procFoodThrow() {
void* esa = fopAcM_fastCreate(PROC_ESA, 0xFFFF0014, &mLeftHandPos, fopAcM_GetRoomNo(this), &shape_angle);
if (esa) {
m3630 = fopAcM_GetID(esa);
if (mDemo.getDemoType() != 5) {
if (!checkSpecialDemoMode()) {
u8 talkBtn = dComIfGp_event_getTalkXYBtn();
if (talkBtn == dTalkBtn_X_e) {
dComIfGs_setReserveBaitEmpty(dItemBtn_X_e);
@@ -169,7 +169,7 @@ BOOL daPy_lk_c::procFoodSet_init() {
if (!dComIfGp_event_compulsory(this)) {
return FALSE;
}
mDemo.setDemoType(5);
mDemo.setSpecialDemoType();
}
int temp = checkShipRideUseItem(1);
@@ -187,7 +187,7 @@ BOOL daPy_lk_c::procFoodSet_init() {
keepItemData();
setHyoiModel();
if (mDemo.getDemoType() == 5) {
if (checkSpecialDemoMode()) {
mProcVar0.m3570 = 1;
dCam_getBody()->StartEventCamera(0x12, fopAcM_GetID(this), "Type", &mProcVar0.m3570, 0);
}
@@ -209,7 +209,7 @@ BOOL daPy_lk_c::procFoodSet() {
}
if (std::abs(frameCtrl.getRate()) < 0.01f) {
if (mDemo.getDemoType() != 5) {
if (!checkSpecialDemoMode()) {
dComIfGp_evmng_cutEnd(mStaffIdx);
} else if (m34D0 < 0) {
dComIfGp_event_reset();
src/d/actor/d_a_player_grab.inc
+1 -1
View File
@@ -324,7 +324,7 @@ BOOL daPy_lk_c::procGrabReady_init() {
setAnimeUnequip();
mProcVar0.m3570 = 0;
}
if ((dComIfGs_getSelectEquip(2) == dItem_POWER_BRACELETS_e ||
if ((checkPowerGloveEquip() ||
!fopAcM_CheckStatus(mpAttnActorA, fopAcStts_UNK10000_e)) &&
!fopAcM_CheckStatus(mpAttnActorA, fopAcStts_CARRY_e))
{
src/d/actor/d_a_player_main.cpp
+143 -154
View File
@@ -541,6 +541,7 @@ BOOL daPy_lk_c::jointCB1() {
/* 80104178-801041B4 .text daPy_jointCallback1__FP7J3DNodei */
static BOOL daPy_jointCallback1(J3DNode* node, int calcTiming) {
UNUSED(node);
if (calcTiming == J3DNodeCBCalcTiming_In) {
J3DModel* model = j3dSys.getModel();
daPy_lk_c* i_this = reinterpret_cast<daPy_lk_c*>(model->getUserArea());
@@ -675,7 +676,7 @@ u16 daPy_lk_c::checkNormalFace() {
if (mCurProc == daPyProc_SHIP_CRANE_e) {
return daPyFace_TMABAA;
}
if (mFace != daPyFace_UNKNOWN) {
if (!checkFaceTypeNot()) {
return mFace;
}
if (checkResetFlg0(daPyRFlg0_UNK40000)) {
@@ -761,9 +762,9 @@ void daPy_lk_c::setTextureAnime(u16 param_1, int param_2) {
}
u16 btp_idx = mTexAnmIndexTable[param_1].mBtpIdx;
u16 btk_idx = mTexAnmIndexTable[param_1].mBtkIdx;
if ((param_1 < 0x13 &&
checkMabaAnimeBtp(m_tex_anm_heap.mIdx)) &&
mFace == daPyFace_UNKNOWN)
if (param_1 < 0x13 &&
checkMabaAnimeBtp(m_tex_anm_heap.mIdx) &&
checkFaceTypeNot())
{
param_2 = m3530;
bVar3 = true;
@@ -771,7 +772,7 @@ void daPy_lk_c::setTextureAnime(u16 param_1, int param_2) {
bVar3 = false;
}
if (m_tex_anm_heap.mIdx == btp_idx) {
if (mFace == daPyFace_UNKNOWN && !checkModeFlg(ModeFlg_00000100 | ModeFlg_00000400)) {
if (checkFaceTypeNot() && !checkModeFlg(ModeFlg_00000100 | ModeFlg_00000400)) {
m3530 = param_2;
}
} else {
@@ -783,7 +784,7 @@ void daPy_lk_c::setTextureAnime(u16 param_1, int param_2) {
dVar9 = cM_rnd();
if (m_tex_scroll_heap.mIdx != btk_idx) {
if (bVar3 && checkModeFlg(ModeFlg_00000001) &&
daPy_matAnm_c::m_maba_flg != 0 &&
daPy_matAnm_c::getMabaFlg() != 0 &&
!dComIfGp_event_runCheck() &&
mpAttnActorLockOn == NULL &&
btk_idx == LKANM_BTK_TMABA)
@@ -1284,7 +1285,7 @@ s32 daPy_lk_c::setItemModel() {
}
mpEquippedSwordModel->calc();
int r27_2;
if (dComIfGs_getSelectEquip(1) == dItem_MIRROR_SHIELD_e) {
if (checkMirrorShieldEquip()) {
r27_2 = 2;
mpEquippedShieldModel = mpShmsModel;
if (mpTshmsBtk != NULL) {
@@ -1297,7 +1298,7 @@ s32 daPy_lk_c::setItemModel() {
mpTshmsBtk->setFrame(dVar16);
}
}
} else if (dComIfGs_getSelectEquip(1) != dItem_NONE_e) {
} else if (checkShieldEquip()) {
r27_2 = 1;
mpEquippedShieldModel = mpShaModel;
} else {
@@ -1355,7 +1356,7 @@ s32 daPy_lk_c::setItemModel() {
} else {
mDoAud_setLinkBootsType(0);
}
if (dComIfGs_getSelectEquip(2) == dItem_POWER_BRACELETS_e) {
if (checkPowerGloveEquip()) {
mpPringModel->setAnmMtx(0x1, mpCLModel->getAnmMtx(0x7));
mpPringModel->setAnmMtx(0x2, mpCLModel->getAnmMtx(0xB));
}
@@ -1375,7 +1376,7 @@ BOOL daPy_lk_c::checkUpperReadyThrowAnime() const {
/* 80106750-801067D8 .text checkNoCollisionCorret__9daPy_lk_cFv */
BOOL daPy_lk_c::checkNoCollisionCorret() {
if (checkModeFlg(ModeFlg_HANG | ModeFlg_ROPE | ModeFlg_IN_SHIP | ModeFlg_LADDER | ModeFlg_CAUGHT) ||
mDemo.getDemoType() == 1 ||
mDemo.getDemoType() == daPy_demo_c::TYPE_TOOL_e ||
mDemo.getDemoMode() == daPy_demo_c::DEMO_OPEN_TREASURE_e ||
mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_030_e ||
checkResetFlg0(daPyRFlg0_CRAWL_AUTO_MOVE) ||
@@ -1427,7 +1428,7 @@ s32 daPy_lk_c::setDrawHandModel() {
uVar5 = 9;
} else if (mEquipItem == daPyItem_SWORD_e) {
uVar4 = 3;
if (dComIfGs_getSelectEquip(1) != dItem_NONE_e) {
if (checkShieldEquip()) {
uVar5 = 8;
} else {
uVar5 = mRightHandIdx;
@@ -1621,7 +1622,7 @@ void daPy_lk_c::drawShadow() {
{
dComIfGd_addRealShadow(mShadowId, mpEquipItemModel);
}
if (dComIfGs_getSelectEquip(1) != dItem_NONE_e
if (checkShieldEquip()
#if VERSION == VERSION_DEMO
&& !checkLastDemoSwordNoDraw(1)
#else
@@ -1912,7 +1913,7 @@ BOOL daPy_lk_c::draw() {
if (checkFreezeState() && checkMaskDraw()) {
entryDLSetLight(mpYamuModel, checkFreezeState());
}
if (dComIfGs_getSelectEquip(2) == dItem_POWER_BRACELETS_e) {
if (checkPowerGloveEquip()) {
entryDLSetLight(mpPringModel, checkFreezeState());
}
if (checkMasterSwordEquip() && !checkCaughtShapeHide()
@@ -1962,7 +1963,7 @@ BOOL daPy_lk_c::draw() {
entryDLSetLight(mpEquippedSwordModel, checkFreezeState());
}
}
if (dComIfGs_getSelectEquip(1) != dItem_NONE_e && !checkCaughtShapeHide()
if (checkShieldEquip() && !checkCaughtShapeHide()
#if VERSION == VERSION_DEMO
&& !checkLastDemoSwordNoDraw(1)
#else
@@ -2172,7 +2173,7 @@ BOOL daPy_lk_c::setTalkStatus() {
/* 80108634-801086C8 .text setHintActor__9daPy_lk_cFv */
int daPy_lk_c::setHintActor() {
if (dComIfGp_att_getZHint() != 0 && !dComIfGp_event_runCheck() && mDemo.getDemoType() == 0) {
if (dComIfGp_att_getZHint() != 0 && !dComIfGp_event_runCheck() && !checkPlayerDemoMode()) {
setDoButtonQuake();
onResetFlg0(daPyRFlg0_UNK100);
dComIfGp_setDoStatus(dActStts_ba_sake__dupe_31);
@@ -2455,7 +2456,7 @@ void daPy_lk_c::posMoveFromFootPos() {
ModeFlg_MIDAIR | ModeFlg_WHIDE | ModeFlg_HANG | ModeFlg_ROPE | ModeFlg_IN_SHIP | ModeFlg_CLIMB |
ModeFlg_PUSHPULL | ModeFlg_LADDER | ModeFlg_CRAWL | ModeFlg_CAUGHT
) &&
!dComIfGp_event_runCheck() && mDemo.getDemoType() == 0 && !checkHeavyStateOn() &&
!dComIfGp_event_runCheck() && !checkPlayerDemoMode() && !checkHeavyStateOn() &&
mCurrAttributeCode == dBgS_Attr_ICE_e &&
!checkNoResetFlg0(daPy_FLG0(daPyFlg0_UNK20000000 | daPyFlg0_UNK80000000)) && !mAcch.ChkWallHit() &&
mAcch.ChkGroundHit())
@@ -2566,7 +2567,7 @@ void daPy_lk_c::posMove() {
posMoveFromFootPos();
if (!checkNoCollisionCorret()) {
current.pos += *mStts.GetCCMoveP();
if (!dComIfGp_event_runCheck() && mDemo.getDemoType() == 0) {
if (!dComIfGp_event_runCheck() && !checkPlayerDemoMode()) {
if (!checkNoResetFlg1(daPyFlg1_UNK10000000) || !checkHeavyStateOn()) {
current.pos.x += m3644 * cM_ssin(m3640);
current.pos.z += m3644 * cM_scos(m3640);
@@ -2601,7 +2602,7 @@ void daPy_lk_c::posMove() {
current.pos.z += m3730.z;
}
}
} else if (!dComIfGp_event_runCheck() && mDemo.getDemoType() == 0 && daPy_getPlayerActorClass() == this &&
} else if (!dComIfGp_event_runCheck() && !checkPlayerDemoMode() && daPy_getPlayerActorClass() == this &&
mCurProc == daPyProc_HANG_MOVE_e)
{
f32 dVar13 = mStts.GetCCMoveP()->absXZ();
@@ -3125,7 +3126,7 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) {
}
f32 f1 = m3598 = 0.0f;
r24 = 2;
if ((checkNoResetFlg1(daPyFlg1_CONFUSE) && mDemo.getDemoType() == 0) &&
if ((checkNoResetFlg1(daPyFlg1_CONFUSE) && !checkPlayerDemoMode()) &&
!dComIfGp_event_runCheck())
{
if (m_anm_heap_under[UNDER_MOVE0_e].mIdx != LKANM_BCK_WAITQ) {
@@ -3171,7 +3172,7 @@ void daPy_lk_c::setBlendMoveAnime(f32 param_1) {
in_f27 = m_HIO->mMove.m.field_0x38;
}
setMoveAnime(f25, in_f27, f29, r28, r27, r24, param_1);
if (r28 == ANM_WAITB && (!dComIfGp_event_runCheck() || mDemo.getDemoType() != 3) &&
if (r28 == ANM_WAITB && (!dComIfGp_event_runCheck() || mDemo.getDemoType() != daPy_demo_c::TYPE_ORIGINAL_e) &&
mFrameCtrlUnder[UNDER_MOVE0_e].checkPass(15.0f))
{
if (dComIfGs_getLife() <= 2) {
@@ -3643,7 +3644,7 @@ void daPy_lk_c::deleteEquipItem(BOOL param_1) {
/* 8010C71C-8010C7F4 .text setFallVoice__9daPy_lk_cFv */
void daPy_lk_c::setFallVoice() {
if (!checkNoResetFlg0(daPyFlg0_NO_FALL_VOICE) &&
(!checkNoResetFlg0(daPyFlg0_UNK80) || m35D0 < mAcch.GetGroundH() || m3580 == 4 ||
(!checkNoResetFlg0(daPyFlg0_UNK80) || mWaterY < mAcch.GetGroundH() || m3580 == 4 ||
-G_CM3D_F_INF == mAcch.GetGroundH()) &&
(m35F0 - current.pos.y > 500.0f))
{
@@ -3790,38 +3791,38 @@ BOOL daPy_lk_c::changeDragonShield(int param_1) {
}
/* 8010CD34-8010CFB4 .text checkNewItemChange__9daPy_lk_cFUc */
BOOL daPy_lk_c::checkNewItemChange(u8 param_1) {
u16 uVar4 = dComIfGp_getSelectItem(param_1);
BOOL daPy_lk_c::checkNewItemChange(u8 i_itemBtn) {
u16 itemNo = dComIfGp_getSelectItem(i_itemBtn);
if (uVar4 == dItem_MAGIC_ARMOR_e) {
if (itemNo == dItem_MAGIC_ARMOR_e) {
return changeDragonShield(1);
}
if (uVar4 == dItem_IRON_BOOTS_e || uVar4 == WATER_BOOTS || uVar4 == dItem_TINGLE_TUNER_e || uVar4 == NORMAL_SAIL ||
isEsa(uVar4) || isDaizaItem(uVar4) || isEmono(uVar4) || checkBottleItem(uVar4) ||
(uVar4 >= dItem_FATHER_LETTER_e && uVar4 <= KAISEN_PRESENT2))
if (itemNo == dItem_IRON_BOOTS_e || itemNo == WATER_BOOTS || itemNo == dItem_TINGLE_TUNER_e || itemNo == NORMAL_SAIL ||
isEsa(itemNo) || isDaizaItem(itemNo) || isEmono(itemNo) || checkBottleItem(itemNo) ||
(itemNo >= dItem_FATHER_LETTER_e && itemNo <= KAISEN_PRESENT2))
{
if (mAcch.ChkGroundHit() && (!daPy_lk_c::checkPlayerFly())) {
if (uVar4 == dItem_IRON_BOOTS_e || uVar4 == WATER_BOOTS) {
procBootsEquip_init(uVar4);
if (itemNo == dItem_IRON_BOOTS_e || itemNo == WATER_BOOTS) {
procBootsEquip_init(itemNo);
} else {
if (isEsa(uVar4)) {
if (uVar4 == dItem_HYOI_PEAR_e) {
if (isEsa(itemNo)) {
if (itemNo == dItem_HYOI_PEAR_e) {
return procFoodSet_init();
} else {
return procFoodThrow_init();
}
} else if (uVar4 == dItem_TINGLE_TUNER_e) {
} else if (itemNo == dItem_TINGLE_TUNER_e) {
fopAcM_orderTalkEvent(this, (fopAc_ac_c*)dComIfGp_getAgb());
} else if (checkDrinkBottleItem(uVar4)) {
return procBottleDrink_init(uVar4);
} else if (checkOpenBottleItem(uVar4)) {
return procBottleOpen_init(uVar4);
} else if (checkDrinkBottleItem(itemNo)) {
return procBottleDrink_init(itemNo);
} else if (checkOpenBottleItem(itemNo)) {
return procBottleOpen_init(itemNo);
} else {
if (uVar4 == dItem_EMPTY_BOTTLE_e) {
if (itemNo == dItem_EMPTY_BOTTLE_e) {
return procBottleSwing_init(1);
} else {
if (dComIfGs_checkGetItemNum(uVar4) != 0) {
return procNotUse_init(uVar4);
if (dComIfGs_checkGetItemNum(itemNo) != 0) {
return procNotUse_init(itemNo);
} else {
return false;
}
@@ -3830,18 +3831,18 @@ BOOL daPy_lk_c::checkNewItemChange(u8 param_1) {
}
return true;
}
if (uVar4 != dItem_EMPTY_BOTTLE_e) {
if (itemNo != dItem_EMPTY_BOTTLE_e) {
return false;
}
}
if (mEquipItem != uVar4 && uVar4 != dItem_NONE_e) {
if (uVar4 == dItem_BOMB_BAG_e &&
if (mEquipItem != itemNo && itemNo != dItem_NONE_e) {
if (itemNo == dItem_BOMB_BAG_e &&
(mActivePlayerBombs >= 3 || dComIfGs_getBombNum() == 0))
{
seStartSystem(JA_SE_ITEM_TARGET_OUT);
return false;
} else {
mReadyItemBtn = param_1;
mReadyItemBtn = i_itemBtn;
setAnimeEquipItem();
}
}
@@ -3859,17 +3860,17 @@ BOOL daPy_lk_c::checkItemChangeFromButton() {
if (swordTrigger() && checkSwordEquip() && mEquipItem != daPyItem_SWORD_e) {
setAnimeEquipSword(1);
} else if (itemTriggerX()) {
if (checkNewItemChange(0)) {
if (checkNewItemChange(dItemBtn_X_e)) {
mReadyItemBtn = dItemBtn_X_e;
return TRUE;
}
} else if (itemTriggerY()) {
if (checkNewItemChange(1)) {
if (checkNewItemChange(dItemBtn_Y_e)) {
mReadyItemBtn = dItemBtn_Y_e;
return TRUE;
}
} else if (itemTriggerZ()) {
if (checkNewItemChange(2)) {
if (checkNewItemChange(dItemBtn_Z_e)) {
mReadyItemBtn = dItemBtn_Z_e;
return TRUE;
}
@@ -3987,7 +3988,7 @@ void daPy_lk_c::checkItemAction() {
}
deleteEquipItem(FALSE);
mEquipItem = m3562;
if (!dComIfGp_event_runCheck() && mDemo.getDemoType() == 0) {
if (!dComIfGp_event_runCheck() && !checkPlayerDemoMode()) {
if (mEquipItem != daPyItem_SWORD_e || !checkNoResetFlg1(daPyFlg1_UNK4000000)) {
if ((checkAttentionLock() || mEquipItem != daPyItem_SWORD_e) || var_r28) {
onResetFlg0(daPyRFlg0_UNK80);
@@ -4354,7 +4355,7 @@ void daPy_lk_c::setShieldGuard() {
f32 local_18 = m_pbCalc[PART_UPPER_e]->getRatio(2);
if (checkGuardSlip() ||
(!checkEquipAnime() && !checkGrabAnime() && checkAttentionLock() && mEquipItem != daPyItem_BOKO_e &&
dComIfGs_getSelectEquip(1) != dItem_NONE_e && checkGuardAccept() &&
checkShieldEquip() && checkGuardAccept() &&
(mActorKeepEquip.getID() == fpcM_ERROR_PROCESS_ID_e || mActorKeepEquip.getActor() != NULL)))
{
dComIfGp_setRStatus(dActStts_DEFEND_e);
@@ -4501,7 +4502,7 @@ BOOL daPy_lk_c::checkNextMode(int r29) {
if (cLib_distanceAngleS(m34E8, current.angle.y) > 0x7800 && mStickDistance > 0.05f)
{
r3 = procWaitTurn_init();
if (!r3 && !dComIfGp_event_runCheck() && mDemo.getDemoType() == 0)
if (!r3 && !dComIfGp_event_runCheck() && !checkPlayerDemoMode())
{
r3 = changeWaitProc();
}
@@ -4889,7 +4890,7 @@ BOOL daPy_lk_c::changeFrontWallTypeProc() {
current.pos.x = (m3724.x + 20.5f * fVar3) - fVar2;
current.pos.y = m3724.y + 37.5f * iVar8;
current.pos.z = (m3724.z + 20.5f * fVar2) + fVar3;
while (m35D0 - current.pos.y > m_HIO->mSwim.m.field_0x24) {
while (mWaterY - current.pos.y > m_HIO->mSwim.m.field_0x24) {
current.pos.y += 37.5f;
}
procLadderMove_init(1, 0, &current.pos);
@@ -5383,7 +5384,7 @@ BOOL daPy_lk_c::changeAutoJumpProc() {
}
if (pcVar4 != NULL && std::abs(pcVar4->GetNP()->y) <= 0.05f &&
dComIfG_Bgsp()->GetWallCode(mLinkLinChk) != 2 && dVar11 < -125.0f &&
m35D0 - current.pos.y < -125.0f && current.pos.y - m35D4 > 125.0f)
mWaterY - current.pos.y < -125.0f && current.pos.y - m35D4 > 125.0f)
{
current.pos.x = mLinkLinChk.GetCrossP()->x;
current.pos.z = mLinkLinChk.GetCrossP()->z;
@@ -5576,7 +5577,7 @@ BOOL daPy_lk_c::changeDemoProc() {
/* 80111A80-80111B80 .text changeDeadProc__9daPy_lk_cFv */
BOOL daPy_lk_c::changeDeadProc() {
if (!dComIfGp_event_runCheck() && mDemo.getDemoType() == 0 && dComIfGs_getLife() == 0 &&
if (!dComIfGp_event_runCheck() && !checkPlayerDemoMode() && dComIfGs_getLife() == 0 &&
!checkModeFlg(ModeFlg_DAMAGE))
{
if (dComIfGs_checkBottle(dItem_FAIRY_BOTTLE_e)) {
@@ -5646,7 +5647,7 @@ void daPy_lk_c::setOldRootQuaternion(s16 param_1, s16 param_2, s16 param_3) {
/* 80111E54-80111EFC .text checkRestHPAnime__9daPy_lk_cFv */
BOOL daPy_lk_c::checkRestHPAnime() {
if (!checkPlayerGuard() && checkNoUpperAnime() && mpAttnActorLockOn == NULL &&
((mDemo.getDemoType() == 0 && !checkModeFlg(ModeFlg_IN_SHIP) &&
((!checkPlayerDemoMode() && !checkModeFlg(ModeFlg_IN_SHIP) &&
dComIfGs_getLife() <= m_HIO->mMove.m.field_0xE) ||
mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_018_e))
{
@@ -5657,7 +5658,7 @@ BOOL daPy_lk_c::checkRestHPAnime() {
/* 80111EFC-80111F5C .text checkHeavyStateOn__9daPy_lk_cFv */
BOOL daPy_lk_c::checkHeavyStateOn() {
if (!dComIfGp_event_runCheck() && mDemo.getDemoType() == 0 &&
if (!dComIfGp_event_runCheck() && !checkPlayerDemoMode() &&
(getHeavyStateAndBoots() || checkGrabSpecialHeavyState())
) {
return TRUE;
@@ -6120,7 +6121,7 @@ BOOL daPy_lk_c::procWait() {
if (m36A0.abs2XZ() <= SQUARE(1.0f / 1000.0f) && m36AC.abs2XZ() >= SQUARE(5.0f)) {
return procIceSlipAlmostFall_init();
}
if (!dComIfGp_event_runCheck() && mDemo.getDemoType() == 0 && spLTrigger() && mAcch.ChkWallHit()) {
if (!dComIfGp_event_runCheck() && !checkPlayerDemoMode() && spLTrigger() && mAcch.ChkWallHit()) {
dBgS_AcchCir* pdVar5 = &mAcchCir[0];
for (int i = 0; i < 3; i++, pdVar5++) {
if (pdVar5->ChkWallHit()) {
@@ -6413,7 +6414,7 @@ BOOL daPy_lk_c::procSideStepLand_init() {
setSingleMoveAnime(dVar2, m_HIO->mSideStep.m.field_0x1C,
m_HIO->mSideStep.m.field_0x20, m_HIO->mSideStep.m.field_0x6,
m_HIO->mSideStep.m.field_0x24);
m34BE = 3;
setFootEffectPosType(3);
onResetFlg0(daPyRFlg0_RIGHT_FOOT_ON_GROUND);
onResetFlg0(daPyRFlg0_LEFT_FOOT_ON_GROUND);
current.angle.y += 0x8000;
@@ -6451,7 +6452,7 @@ BOOL daPy_lk_c::procCrouchDefense_init() {
/* 80113DBC-80114014 .text procCrouchDefense__9daPy_lk_cFv */
BOOL daPy_lk_c::procCrouchDefense() {
dComIfGp_setRStatus(dActStts_DEFEND_e);
if (dCam_getBody()->ChangeModeOK(4) && current.pos.y >= m35D0) {
if (dCam_getBody()->ChangeModeOK(4) && current.pos.y >= mWaterY) {
onResetFlg0(daPyRFlg0_SUBJECT_ACCEPT);
if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x1000) && !dComIfGp_event_runCheck()) {
return procSubjectivity_init(1);
@@ -6522,7 +6523,7 @@ BOOL daPy_lk_c::procCrouchDefenseSlip_init() {
} else {
m35E8 = mFrameCtrlUnder[UNDER_MOVE0_e].getFrame();
}
m34BE = 3;
setFootEffectPosType(3);
dComIfGp_setPlayerStatus1(0, daPyStts1_UNK80000_e);
return true;
}
@@ -6573,7 +6574,7 @@ BOOL daPy_lk_c::procCrouch() {
cXyz local_68;
dComIfGp_setRStatus(dActStts_CROUCH_e);
if (dCam_getBody()->ChangeModeOK(4) && current.pos.y >= m35D0) {
if (dCam_getBody()->ChangeModeOK(4) && current.pos.y >= mWaterY) {
onResetFlg0(daPyRFlg0_SUBJECT_ACCEPT);
if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x1000) && !dComIfGp_event_runCheck()) {
return procSubjectivity_init(1);
@@ -6582,29 +6583,25 @@ BOOL daPy_lk_c::procCrouch() {
cLib_addCalc(&mVelocity, 0.0f, m_HIO->mMove.m.field_0x24, m_HIO->mMove.m.field_0x1C,
m_HIO->mMove.m.field_0x20);
if (!spActionButton() ||
(checkAttentionLock() && dComIfGs_getSelectEquip(1) != dItem_NONE_e && checkGuardAccept()))
(checkAttentionLock() && checkShieldEquip() && checkGuardAccept()))
{
checkNextMode(0);
} else {
if ((m_old_fdata->getOldFrameRate() < 0.01f && mStickDistance > 0.05f) &&
!(m35D0 > current.pos.y + 15.0f))
{
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::ZXYrotM(m34E2, shape_angle.y, 0);
mDoMtx_stack_c::multVec(&l_crawl_start_front_offset, &acStack_20);
mDoMtx_stack_c::multVec(&l_crawl_top_offset, &cStack_2c);
if (getCrawlMoveVec(&cStack_2c, &acStack_20, &cStack_38)) {
local_5c = current.pos - cStack_38;
local_5c.y += 5.0f;
mGndChk.SetPos(&local_5c);
local_5c.y = dComIfG_Bgsp()->GroundCross(&mGndChk);
local_68 = current.pos - local_5c;
if (cLib_distanceAngleS(cM_atan2s(-local_68.y, local_68.absXZ()), m34E2) > 0x100) {
return true;
}
} else if (m_old_fdata->getOldFrameRate() < 0.01f && mStickDistance > 0.05f && !checkCrawlWaterIn()) {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::ZXYrotM(m34E2, shape_angle.y, 0);
mDoMtx_stack_c::multVec(&l_crawl_start_front_offset, &acStack_20);
mDoMtx_stack_c::multVec(&l_crawl_top_offset, &cStack_2c);
if (getCrawlMoveVec(&cStack_2c, &acStack_20, &cStack_38)) {
local_5c = current.pos - cStack_38;
local_5c.y += 5.0f;
mGndChk.SetPos(&local_5c);
local_5c.y = dComIfG_Bgsp()->GroundCross(&mGndChk);
local_68 = current.pos - local_5c;
if (cLib_distanceAngleS(cM_atan2s(-local_68.y, local_68.absXZ()), m34E2) > 0x100) {
return true;
}
procCrawlStart_init();
}
procCrawlStart_init();
}
return true;
}
@@ -6696,7 +6693,7 @@ BOOL daPy_lk_c::procSlip_init() {
} else if (m_HIO->mSlip.m.field_0x0 == 2 && mVelocity > mMaxNormalSpeed) {
mVelocity = mMaxNormalSpeed;
}
m34BE = 2;
setFootEffectPosType(2);
seStartMapInfo(JA_SE_LK_RUN_SLIP);
return true;
}
@@ -6752,7 +6749,7 @@ BOOL daPy_lk_c::procSlideFront_init(s16 param_1) {
setSingleMoveAnime(ANM_SLIDEF, m_HIO->mSlide.m.field_0xC, m_HIO->mSlide.m.field_0x10,
m_HIO->mSlide.m.field_0x0, m_HIO->mSlide.m.field_0x14);
mMaxNormalSpeed = m_HIO->mSlide.m.field_0x44;
m34BE = 4;
setFootEffectPosType(4);
dComIfGp_setPlayerStatus1(0, daPyStts1_UNK100_e);
return true;
}
@@ -6787,7 +6784,7 @@ BOOL daPy_lk_c::procSlideBack_init(s16 param_1) {
setSingleMoveAnime(ANM_SLIDEB, m_HIO->mSlide.m.field_0x18, m_HIO->mSlide.m.field_0x1C,
m_HIO->mSlide.m.field_0x2, m_HIO->mSlide.m.field_0x20);
mMaxNormalSpeed = m_HIO->mSlide.m.field_0x44;
m34BE = 3;
setFootEffectPosType(3);
dComIfGp_setPlayerStatus1(0, daPyStts1_UNK200_e);
return true;
}
@@ -6904,7 +6901,7 @@ BOOL daPy_lk_c::procFrontRoll_init(f32 param_1) {
/* 80115478-80115628 .text procFrontRoll__9daPy_lk_cFv */
BOOL daPy_lk_c::procFrontRoll() {
if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > 6.0f) {
m34BE = 4;
setFootEffectPosType(4);
endFlameDamageEmitter();
}
if (getSlidePolygon() != NULL) {
@@ -7023,7 +7020,7 @@ BOOL daPy_lk_c::procSideRoll_init() {
if (checkHeavyStateOn()) {
mVelocity *= m_HIO->mMove.m.field_0x80;
}
m34BE = 4;
setFootEffectPosType(4);
return true;
}
@@ -7104,7 +7101,7 @@ BOOL daPy_lk_c::procBackJumpLand_init() {
setSingleMoveAnime(ANM_ROLLBLAND, m_HIO->mBackJump.m.field_0x24,
m_HIO->mBackJump.m.field_0x28, m_HIO->mBackJump.m.field_0x2,
m_HIO->mBackJump.m.field_0x2C);
m34BE = 3;
setFootEffectPosType(3);
onResetFlg0(daPyRFlg0_RIGHT_FOOT_ON_GROUND);
onResetFlg0(daPyRFlg0_LEFT_FOOT_ON_GROUND);
current.angle.y = shape_angle.y;
@@ -7265,7 +7262,7 @@ BOOL daPy_lk_c::procLand_init(f32 param_1, int param_2) {
setSingleMoveAnime(ANM_JMPEDS, param_1, m_HIO->mAutoJump.m.field_0x28,
m_HIO->mAutoJump.m.field_0x4, m_HIO->mAutoJump.m.field_0x34);
}
m34BE = 3;
setFootEffectPosType(3);
onResetFlg0(daPyRFlg0_RIGHT_FOOT_ON_GROUND);
onResetFlg0(daPyRFlg0_LEFT_FOOT_ON_GROUND);
if (current.angle.y != shape_angle.y) {
@@ -7325,7 +7322,7 @@ BOOL daPy_lk_c::procLandDamage_init(int param_1) {
mProcVar0.m3570 = 0;
seStartOnlyReverb(JA_SE_LK_FALL_DAMAGE);
voiceStart(13);
m34BE = 5;
setFootEffectPosType(5);
return true;
}
@@ -7607,10 +7604,10 @@ BOOL daPy_lk_c::procDamage_init() {
m_HIO->mDam.mDamage.m.field_0x0, m_HIO->mDam.mDamage.m.field_0x8);
current.angle.y = cM_atan2s(damage_vec->x, damage_vec->z);
if (dVar2 != ANM_DAMR) {
m34BE = 2;
setFootEffectPosType(2);
}
if (dVar2 != ANM_DAML) {
m34BE = 1;
setFootEffectPosType(1);
}
mVelocity =
(m_HIO->mDam.mDamage.m.field_0x10 * damage_vec->absXZ()) + m_HIO->mDam.mDamage.m.field_0xC;
@@ -7956,12 +7953,12 @@ BOOL daPy_lk_c::procLargeDamageUp_init(int param_1, int param_2, s16 param_3, s1
m34D0 = 30000;
dProcFreezeDamage_init_sub(0);
}
m34BE = 6;
setFootEffectPosType(6);
dComIfGp_getVibration().StartShock(6, -0x21, cXyz(0.0f, 1.0f, 0.0f));
seStartMapInfo(JA_SE_LK_FALL_DOWN);
} else {
m34D0 = 0;
m34BE = 6;
setFootEffectPosType(6);
dComIfGp_getVibration().StartShock(6, -0x21, cXyz(0.0f, 1.0f, 0.0f));
seStartMapInfo(JA_SE_LK_FALL_DOWN);
if (param_1 == ANM_DAMFB) {
@@ -8220,7 +8217,7 @@ BOOL daPy_lk_c::procElecDamage_init(const cXyz* param_1) {
if (!dComIfGp_event_compulsory(this)) {
return false;
}
mDemo.setDemoType(5);
mDemo.setSpecialDemoType();
int iVar2 = checkShipRideUseItem(0);
if (checkModeFlg(ModeFlg_SWIM)) {
current.pos.y += m35C4;
@@ -8328,7 +8325,7 @@ BOOL daPy_lk_c::procGuardSlip_init() {
m35E8 = mFrameCtrlUnder[UNDER_MOVE0_e].getFrame();
}
current.angle.y = cM_atan2s(damage_vec->x, damage_vec->z);
m34BE = 3;
setFootEffectPosType(3);
m_pbCalc[PART_UPPER_e]->setRatio(2, 0.0f);
return true;
}
@@ -8416,7 +8413,7 @@ BOOL daPy_lk_c::procIceSlipFallUp_init(int param_1, s16 param_2, s16 param_3) {
s16 sVar6;
commonProcInit(daPyProc_ICE_SLIP_FALL_UP_e);
m34BE = 6;
setFootEffectPosType(6);
dComIfGp_getVibration().StartShock(3, -0x3f, cXyz(0.0f, 1.0f, 0.0f));
seStartMapInfo(JA_SE_LK_FALL_DOWN);
if (param_1 == ANM_DAMFB) {
@@ -8568,7 +8565,7 @@ BOOL daPy_lk_c::procNotUse_init(int param_1) {
if (!dComIfGp_event_compulsory(this)) {
return false;
}
mDemo.setDemoType(5);
mDemo.setSpecialDemoType();
commonProcInit(daPyProc_NOT_USE_e);
current.angle.y = shape_angle.y;
mVelocity = 0.0f;
@@ -8914,13 +8911,13 @@ void daPy_lk_c::setWaterY() {
} else {
offNoResetFlg0(daPyFlg0_UNK80);
}
m35D0 = mAcch.m_wtr.GetHeight();
mWaterY = mAcch.m_wtr.GetHeight();
dPa_control_c::offStatus(1);
} else {
onNoResetFlg0(daPyFlg0_UNK80);
m35D0 = daSea_calcWave(current.pos.x, current.pos.z);
if (mAcch.m_wtr.GetHeight() > m35D0) {
m35D0 = mAcch.m_wtr.GetHeight();
mWaterY = daSea_calcWave(current.pos.x, current.pos.z);
if (mAcch.m_wtr.GetHeight() > mWaterY) {
mWaterY = mAcch.m_wtr.GetHeight();
dPa_control_c::offStatus(1);
} else {
dPa_control_c::onStatus(1);
@@ -8935,7 +8932,7 @@ void daPy_lk_c::autoGroundHit() {
if (mTinkleHoverTimer == 0) {
offNoResetFlg0(daPyFlg0_HOVER_BOOTS);
}
if (!dComIfGp_event_runCheck() && mDemo.getDemoType() == 0) {
if (!dComIfGp_event_runCheck() && !checkPlayerDemoMode()) {
if (mTinkleHoverTimer > 0) {
mTinkleHoverTimer--;
}
@@ -8962,7 +8959,7 @@ void daPy_lk_c::autoGroundHit() {
if (!(mTinkleHoverTimer > 0)) {
return;
}
if (dComIfGp_event_runCheck() && mDemo.getDemoType() != 5) {
if (dComIfGp_event_runCheck() && !checkSpecialDemoMode()) {
return;
}
current.pos.y = old.pos.y;
@@ -9065,7 +9062,7 @@ void daPy_lk_c::setNeckAngle() {
sp18 = &spA0;
r28 = true;
} else if (r24 != NULL && cLib_distanceAngleS(cLib_targetAngleY(&current.pos, &r24->eyePos), m34DE) <= 0x6000) {
sp18 = &(r24->eyePos);
sp18 = &r24->eyePos;
r28 = true;
} else if (checkModeFlg(ModeFlg_00000080 | ModeFlg_08000000)) {
if (!dComIfGp_event_runCheck() || mDemo.getDemoMode() == daPy_demo_c::DEMO_RD_STOP_e) {
@@ -9098,9 +9095,8 @@ void daPy_lk_c::setNeckAngle() {
}
}
} else if (mCurProc == daPyProc_BOTTLE_OPEN_e) {
r24 = mActorKeepRope.getActor();
if (r24 != NULL) {
sp18 = &(r24->eyePos);
if (mActorKeepRope.getActor() != NULL) {
sp18 = &mActorKeepRope.getActor()->eyePos;
r28 = true;
}
} else {
@@ -9112,9 +9108,9 @@ void daPy_lk_c::setNeckAngle() {
mode == daPy_demo_c::DEMO_N_WALK_e ||
mode == daPy_demo_c::DEMO_N_DASH_e
) {
r24 = getDemoLookActor();
if (r24 != NULL) {
sp18 = &r24->eyePos;
fopAc_ac_c* r24_3 = getDemoLookActor();
if (r24_3 != NULL) {
sp18 = &r24_3->eyePos;
r28 = true;
}
}
@@ -9687,7 +9683,7 @@ void daPy_lk_c::checkLightHit() {
} else {
lightHit = FALSE;
}
if (dComIfGs_getSelectEquip(1) == dItem_MIRROR_SHIELD_e) {
if (checkMirrorShieldEquip()) {
mDoMtx_multVecSR(mpEquippedShieldModel->getBaseTRMtx(), &l_ms_light_local_vec, &lightVec);
if (lightHit) {
onResetFlg0(daPyRFlg0_LIGHT_REFLECT);
@@ -10308,7 +10304,7 @@ void daPy_lk_c::setAttentionPos() {
// !@bug(?): l_ship_offset is probably supposed to be x, not z.
attention_info.position.x = ship->current.pos.x + cM_ssin(ship->shape_angle.y) * l_ship_offset.z;
if (checkNoResetFlg0(daPyFlg0_UNK80)) {
attention_info.position.y = 92.5f + (m35D0 + l_ship_offset.y);
attention_info.position.y = 92.5f + (mWaterY + l_ship_offset.y);
} else {
attention_info.position.y = 92.5f + mpCLModel->getBaseTRMtx()[1][3];
}
@@ -10369,14 +10365,14 @@ void daPy_lk_c::setDemoData() {
if (mCurProc == daPyProc_SUBJECTIVITY_e) {
procWait_init();
}
if (mDemo.getDemoType() == 4 && !dComIfGp_evmng_checkStartDemo()) {
mDemo.setDemoType(2);
if (mDemo.getDemoType() == daPy_demo_c::TYPE_START_e && !dComIfGp_evmng_checkStartDemo()) {
mDemo.setSystemDemoType();
}
if (demo_actor_p != NULL) {
demo_actor_p->setModel(mpCLModel);
mStaffIdx = -1;
if (mDemo.getDemoType() != 1) {
mDemo.setDemoType(1);
if (mDemo.getDemoType() != daPy_demo_c::TYPE_TOOL_e) {
mDemo.setToolDemoType();
freeGrabItem();
freeRopeItem();
freeHookshotItem();
@@ -10414,8 +10410,8 @@ void daPy_lk_c::setDemoData() {
}
}
} else {
if (mDemo.getDemoType() == 0 && dComIfGp_event_runCheck()) {
mDemo.setDemoType(2);
if (!checkPlayerDemoMode() && dComIfGp_event_runCheck()) {
mDemo.setSystemDemoType();
}
if (mStaffIdx != -1) {
char* cut_name = dComIfGp_getPEvtManager()->getMyNowCutName(mStaffIdx);
@@ -10451,7 +10447,7 @@ void daPy_lk_c::setDemoData() {
}
prm0_p = dComIfGp_evmng_getMyIntegerP(mStaffIdx, "prm0");
prm1_p = dComIfGp_evmng_getMyIntegerP(mStaffIdx, "prm1");
if (mDemo.getDemoType() == 2) {
if (mDemo.getDemoType() == daPy_demo_c::TYPE_SYSTEM_e) {
f32* stick_p = dComIfGp_evmng_getMyFloatP(mStaffIdx, "stick");
if (stick_p != NULL) {
mDemo.setStick(*stick_p);
@@ -10473,7 +10469,7 @@ void daPy_lk_c::setDemoData() {
if ((demo_mode == daPy_demo_c::DEMO_SHIP_e) && dComIfGp_getShipActor() == NULL) {
demo_mode = daPy_demo_c::DEMO_N_WAIT_e;
}
if (mDemo.getDemoType() == 4) {
if (mDemo.getDemoType() == daPy_demo_c::TYPE_START_e) {
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_KEEP_e) {
if (mDemo.getTimer() != 0) {
mDemo.decTimer();
@@ -10488,7 +10484,7 @@ void daPy_lk_c::setDemoData() {
}
return;
}
if (mDemo.getDemoType() == 1 || (mDemo.getDemoType() == 2 && mStaffIdx != -1)) {
if (mDemo.getDemoType() == daPy_demo_c::TYPE_TOOL_e || (mDemo.getDemoType() == daPy_demo_c::TYPE_SYSTEM_e && mStaffIdx != -1)) {
if (prm0_p != NULL) {
mDemo.setParam0(*prm0_p);
} else {
@@ -10552,7 +10548,7 @@ void daPy_lk_c::setDemoData() {
mDemo.setMoveAngle(angle);
}
mDemo.setDemoMode(demo_mode);
} else if (mDemo.getDemoType() != 3) {
} else if (mDemo.getDemoType() != daPy_demo_c::TYPE_ORIGINAL_e) {
mDemo.setDemoMode(demo_mode);
}
if ((checkModeFlg(ModeFlg_00080000) || (mDemo.getDemoMode() == daPy_demo_c::DEMO_N_TALK_e)) ||
@@ -10773,7 +10769,7 @@ u32 daPy_lk_c::setParamData(int roomNo, int spawnType, int eventInfoIdx, int ext
/* 8012010C-8012024C .text checkLavaFace__9daPy_lk_cFP4cXyzi */
BOOL daPy_lk_c::checkLavaFace(cXyz* oldPos, int attributeCode) {
if (mDemo.getDemoType() == 5) {
if (checkSpecialDemoMode()) {
return FALSE;
}
@@ -10809,20 +10805,13 @@ BOOL daPy_lk_c::checkLavaFace(cXyz* oldPos, int attributeCode) {
/* 8012024C-80120724 .text checkFallCode__9daPy_lk_cFv */
void daPy_lk_c::checkFallCode() {
int iVar1;
s32 bVar2;
u32 uVar3;
BOOL bVar4;
f32 dVar5;
f32 dVar6;
cXyz local_44;
if (m3580 == 4 || -G_CM3D_F_INF == mAcch.GetGroundH()) {
bVar4 = m35D0 > mAcch.GetGroundH() ? TRUE : FALSE;
if (((((!bVar4) && checkModeFlg(ModeFlg_MIDAIR)) &&
(!checkModeFlg(ModeFlg_HOOKSHOT) && (m35F4 - current.pos.y > 100.0f * m_HIO->mFall.m.field_0x14))) ||
BOOL bVar4 = mWaterY > mAcch.GetGroundH() ? TRUE : FALSE;
if (((!bVar4 && checkModeFlg(ModeFlg_MIDAIR) && !checkModeFlg(ModeFlg_HOOKSHOT) && m35F4 - current.pos.y > 100.0f * m_HIO->mFall.m.field_0x14) ||
(bVar4 && checkModeFlg(ModeFlg_SWIM))) ||
(mAcch.ChkGroundHit() && (!checkNoResetFlg0(daPy_FLG0(daPyFlg0_UNK20000000 | daPyFlg0_UNK80000000)))))
(mAcch.ChkGroundHit() && !checkNoResetFlg0(daPy_FLG0(daPyFlg0_UNK20000000 | daPyFlg0_UNK80000000))))
{
startRestartRoom(5, 0xC9, -1.0f, 0);
mAcch.ClrGroundHit();
@@ -10833,8 +10822,8 @@ void daPy_lk_c::checkFallCode() {
startRestartRoom(5, 0xC9, -1.0f, 0);
return;
}
iVar1 = dComIfG_Bgsp()->GetExitId(mAcch.m_gnd);
bVar2 = dComIfG_Bgsp()->GetRoomId(mAcch.m_gnd);
int iVar1 = dComIfG_Bgsp()->GetExitId(mAcch.m_gnd);
s32 bVar2 = dComIfG_Bgsp()->GetRoomId(mAcch.m_gnd);
daShip_c* ship = (daShip_c*)dComIfGp_getShipActor();
if (iVar1 == 0x3f) {
return;
@@ -10844,15 +10833,15 @@ void daPy_lk_c::checkFallCode() {
(m3580 == 5 && m35F4 - current.pos.y > 500.0f)))
{
dComIfGs_startFwaterTimer();
dVar6 = speedF;
dVar5 = 1.5f;
if (dVar6 < dVar5) {
dVar5 = dVar5;
} else if (dVar6 > m_HIO->mMove.m.field_0x18) {
f32 dVar5;
if (speedF < 1.5f) {
dVar5 = 1.5f;
} else if (speedF > m_HIO->mMove.m.field_0x18) {
dVar5 = m_HIO->mMove.m.field_0x18;
} else {
dVar5 = dVar6;
dVar5 = speedF;
}
u32 uVar3;
if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) {
uVar3 = 1;
if (dComIfGp_getShipActor() != NULL) {
@@ -10887,7 +10876,7 @@ void daPy_lk_c::checkFallCode() {
seStartSystem(JA_SE_LK_MAZE_WARP_IN);
}
if (!eventInfo.checkCommandDoor()) {
mDemo.setDemoType(3);
mDemo.setOriginalDemoType();
if (m3580 == 5) {
mDemo.setDemoMode(daPy_demo_c::DEMO_PFALL_e);
} else if ((checkModeFlg(ModeFlg_SWIM) || m34C3 == 1) || m34C3 == 4) {
@@ -11120,7 +11109,7 @@ void daPy_lk_c::setBeltConveyerPower() {
int local_58;
cXyz cStack_3c;
if (!checkHeavyStateOn() && !dComIfGp_event_runCheck() && mDemo.getDemoType() == 0 &&
if (!checkHeavyStateOn() && !dComIfGp_event_runCheck() && !checkPlayerDemoMode() &&
!checkNoResetFlg0((daPy_FLG0)(daPyFlg0_UNK20000000 | daPyFlg0_UNK80000000)) &&
(mAcch.ChkGroundHit() || checkModeFlg(ModeFlg_SWIM)))
{
@@ -11160,7 +11149,7 @@ void daPy_lk_c::setWindAtPower() {
}
}
if (mWindCyl.ChkTgHit() && (mDamageWaitTimer == 0 || m34BA == 0) && !dComIfGp_event_runCheck() &&
mDemo.getDemoType() == 0 && mCurProc != daPyProc_FAN_GLIDE_e)
!checkPlayerDemoMode() && mCurProc != daPyProc_FAN_GLIDE_e)
{
local_58 = *mWindCyl.GetTgRVecP();
dVar6 = local_58.absXZ();
@@ -11263,7 +11252,7 @@ BOOL daPy_lk_c::execute() {
offNoResetFlg1(daPyFlg1_UNK200);
dComIfGs_setEventReg(dSv_event_flag_c::UNK_9EFF, 0);
dComIfGp_event_reset();
mDemo.setDemoType(0);
mDemo.resetDemoType();
}
return TRUE;
}
@@ -11273,7 +11262,7 @@ BOOL daPy_lk_c::execute() {
if (dComIfGp_event_compulsory(this)) {
onNoResetFlg1(daPyFlg1_UNK200);
dComIfGs_setBottleItemIn(dItem_FOREST_WATER_e, dItem_WATER_BOTTLE_e);
mDemo.setDemoType(5);
mDemo.setSpecialDemoType();
m3628 = fpcM_ERROR_PROCESS_ID_e;
#if VERSION > VERSION_JPN
if (mCurProc == daPyProc_SCOPE_e) {
@@ -11381,7 +11370,7 @@ BOOL daPy_lk_c::execute() {
daPy_matAnm_c::decMabaTimer();
if (mCurProc == daPyProc_BOTTLE_SWING_e && eventInfo.checkCommandCatch()) {
mDemo.setDemoType(5);
mDemo.setSpecialDemoType();
}
setActorPointer();
@@ -11433,7 +11422,7 @@ BOOL daPy_lk_c::execute() {
procRopeReady_init();
}
if (mDemo.getDemoType() != 5) {
if (!checkSpecialDemoMode()) {
if (!changeDemoProc() && !changeDeadProc() &&
mCurProc != daPyProc_DEMO_LAVA_DAMAGE_e && mCurProc != daPyProc_DEMO_FREEZE_DAMAGE_e
) {
@@ -11481,7 +11470,7 @@ BOOL daPy_lk_c::execute() {
if (checkModeFlg(ModeFlg_SWIM)) {
if (checkNoResetFlg0(daPyFlg0_UNK100) && !checkSwimFallCheck()) {
current.pos.y = m35D0;
current.pos.y = mWaterY;
}
if (mCurProc != daPyProc_DEMO_DEAD_e) {
if (mAcch.GetGroundH() + 84.9f > current.pos.y && mAcch.ChkGroundHit()) {
@@ -11777,7 +11766,7 @@ BOOL daPy_lk_c::execute() {
mDoAud_setLinkHp(dComIfGs_getLife(), dComIfGs_getMaxLife());
mShieldFrontRangeYAngle = shape_angle.y + mBodyAngle.y;
mFace = daPyFace_UNKNOWN;
mFace = daPyFace_NONE;
if (checkConfuse()) {
seStartMapInfo(JA_SE_LK_NOW_CURSE_PW);
@@ -12405,7 +12394,7 @@ void daPy_lk_c::playerInit() {
dKy_plight_set(&mLightInfluence);
m352E = 900;
mFace = daPyFace_UNKNOWN;
mFace = daPyFace_NONE;
m34DE = shape_angle.y;
ResTIMG* linktex_casual = (ResTIMG*)dComIfG_getObjectRes(l_arcName, LINK_BTI_LINKTEXBCI4);
@@ -12585,7 +12574,7 @@ cPhs_State daPy_lk_c::makeBgWait() {
} else if (sceneMode == 6) {
ship->setStartModeThrow();
} else if (sceneMode == 4 || sceneMode == 5) {
mDemo.setDemoType(4);
mDemo.setStartDemoType();
mDoAud_subBgmStop();
procShipRestart_init();
} else if (startMode == 9) {
@@ -12598,7 +12587,7 @@ cPhs_State daPy_lk_c::makeBgWait() {
}
}
} else if (startMode == 4) {
mDemo.setDemoType(4);
mDemo.setStartDemoType();
mDoAud_bgmStart(JA_BGM_I_MAJU_JAIL);
procLargeDamage_init(-7, 0, 0, 0);
} else if (sceneMode == 4 || sceneMode == 5) {
@@ -12607,14 +12596,14 @@ cPhs_State daPy_lk_c::makeBgWait() {
m34C2 = 0;
} else {
current.pos.y = mAcch.GetGroundH();
mDemo.setDemoType(4);
mDemo.setStartDemoType();
mDoAud_subBgmStop();
procLargeDamageUp_init(sceneMode == 4 ? -1 : -2, 1, 0, 0);
}
} else if (startMode == 1 || startMode == 5) {
if (mEventIdx == 0xFF) {
mVelocity = dComIfGs_getLastSceneSpeedF();
mDemo.setDemoType(4);
mDemo.setStartDemoType();
mDemo.setDemoMode(daPy_demo_c::DEMO_KEEP_e);
mDemo.setMoveAngle(current.angle.y);
mDemo.setTimer(0x23);
@@ -12661,7 +12650,7 @@ cPhs_State daPy_lk_c::makeBgWait() {
} else if (startMode == 0xf) {
procSlowFall_init();
} else if (startMode == 0xe) {
mDemo.setDemoType(4);
mDemo.setStartDemoType();
mDemo.setDemoMode(daPy_demo_c::DEMO_N_WAIT_e);
procWait_init();
csXyz auStack_58(0, 0, 0);
@@ -13141,7 +13130,7 @@ void daPy_lk_c::endDemoMode() {
}
offNoResetFlg0(daPyFlg0_UNK100000);
dComIfGp_clearPlayerStatus0(0, daPyStts0_UNK10_e);
mDemo.setDemoType(0);
mDemo.resetDemoType();
mDemo.setDemoMode(daPy_demo_c::DEMO_UNK00_e);
mDemo.setParam0(0);
mDemo.setParam1(0);
src/d/actor/d_a_player_particle.inc
+49 -53
View File
@@ -640,7 +640,7 @@ void daPy_lk_c::setWaterRipple() {
!var_r3 &&
(!checkModeFlg(ModeFlg_IN_SHIP | ModeFlg_HANG) || checkModeFlg(ModeFlg_SWIM)) &&
(
(checkNoResetFlg0(daPyFlg0_UNK80) && m35D0 > 5.0f + mCyl.GetC().y && m35D0 < mCyl.GetC().y + mCyl.GetH()) ||
(checkNoResetFlg0(daPyFlg0_UNK80) && mWaterY > 5.0f + mCyl.GetC().y && mWaterY < mCyl.GetC().y + mCyl.GetH()) ||
(mCurrAttributeCode == dBgS_Attr_WATER_e && mAcch.ChkGroundHit())
)
)
@@ -687,7 +687,7 @@ void daPy_lk_c::setWaterRipple() {
cXyz local_1c;
cMtx_multVec(mpCLModel->getAnmMtx(15), &wave_offset, &local_1c);
local_1c.y = m35D0;
local_1c.y = mWaterY;
f32 cos = cM_scos(shape_angle.y) * 5.0f;
f32 sin = cM_ssin(shape_angle.y) * 5.0f;
@@ -695,10 +695,10 @@ void daPy_lk_c::setWaterRipple() {
cXyz local_20(local_1c.x + cos, local_1c.y, local_1c.z - sin);
cXyz local_28(local_1c.x - cos, local_1c.y, local_1c.z + sin);
mSwimTailEcallBack[0].setPos(local_20);
mSwimTailEcallBack[0].setWaterY(m35D0 + 2.0f);
mSwimTailEcallBack[0].setWaterY(mWaterY + 2.0f);
mSwimTailEcallBack[0].setWaterFlatY(mAcch.m_wtr.GetHeight());
mSwimTailEcallBack[1].setPos(local_28);
mSwimTailEcallBack[1].setWaterY(m35D0 + 2.0f);
mSwimTailEcallBack[1].setWaterY(mWaterY + 2.0f);
mSwimTailEcallBack[1].setWaterFlatY(mAcch.m_wtr.GetHeight());
cXyz local_40;
@@ -708,7 +708,7 @@ void daPy_lk_c::setWaterRipple() {
cXyz local_4c;
mDoMtx_multVecZero(suimenMunyaMtx, &local_4c);
local_40.y = m35D0;
local_40.y = mWaterY;
local_4c -= local_40;
cXyz local_50;
@@ -827,8 +827,8 @@ void daPy_lk_c::setFootEffectType(int effectID, cXyz* i_pos, int param_2, int pa
footEffect->setPos(i_pos);
footEffect->setAngle(&angle);
if (effectID == dPa_name::ID_AK_JN_ELEMENTSHIBUKI00) {
if (checkNoResetFlg0(daPyFlg0_UNK80) && m35D0 > 10.0f + i_pos->y) {
footEffect->getPos().y = m35D0 - 10.0f;
if (checkNoResetFlg0(daPyFlg0_UNK80) && mWaterY > 10.0f + i_pos->y) {
footEffect->getPos().y = mWaterY - 10.0f;
}
} else if (mCurProc == daPyProc_CUT_ROLL_e && effectID == dPa_name::ID_AK_JT_ELEMENTSMOKE00) {
effectID = -2;
@@ -943,10 +943,10 @@ void daPy_lk_c::setFootEffect() {
}
}
if (checkResetFlg0(daPyRFlg0_UNK10) && mCurrAttributeCode == dBgS_Attr_WATER_e && m35D0 > 25.0f + current.pos.y) {
if (checkResetFlg0(daPyRFlg0_UNK10) && mCurrAttributeCode == dBgS_Attr_WATER_e && mWaterY > 25.0f + current.pos.y) {
cXyz& p = m3410.getPos();
p.x = current.pos.x + 45.0f * cM_ssin(current.angle.y);
p.y = m35D0;
p.y = mWaterY;
p.z = current.pos.z + 45.0f * cM_scos(current.angle.y);
m3410.setAngle(0, current.angle.y + 0x8000, 0);
@@ -969,7 +969,7 @@ void daPy_lk_c::setFootEffect() {
if (strcmp(dComIfGp_getStartStageName(), "Adanmae") == 0) {
if (checkResetFlg0(daPyRFlg0_UNK10)) {
if (getFootOnGround() && m35D0 <= current.pos.y) {
if (getFootOnGround() && mWaterY <= current.pos.y) {
dComIfGp_particle_setP1(dPa_name::ID_AK_SN_VOLCANICASHESRUN00, &pos, &current.angle);
}
}
@@ -986,9 +986,9 @@ void daPy_lk_c::setFootEffect() {
(checkHeavyStateOn() || effectID == dPa_name::ID_AK_JN_ELEMENTSHIBUKI00 || effectID == dPa_name::ID_AK_JN_ELEMENTKUSA00)
) {
if (getRightFootOnGround()) {
m34BE = 2;
setFootEffectPosType(2);
} else {
m34BE = 1;
setFootEffectPosType(1);
}
if (checkHeavyStateOn()) {
@@ -1009,7 +1009,7 @@ void daPy_lk_c::setFootEffect() {
}
}
if (m34BE == 0) {
if (mFootEffectPosType == 0) {
return;
}
@@ -1030,46 +1030,42 @@ void daPy_lk_c::setFootEffect() {
pos.y = current.pos.y;
pos.z = m370C.z - rnd * cM_scos(current.angle.y);
setFootEffectType(effectID, &pos, 0, var_r29);
} else {
if (m34BE == 4) {
f32 rnd = cM_rndFX(17.5f);
pos.x = current.pos.x + rnd * cM_scos(current.angle.y);
pos.y = current.pos.y;
pos.z = current.pos.z - rnd * cM_scos(current.angle.y);
setFootEffectType(effectID, &pos, 0, var_r29);
} else if (m34BE == 3) {
if (mCurrAttributeCode == dBgS_Attr_GRASS_e || mCurrAttributeCode == dBgS_Attr_WATER_e) {
mDoMtx_multVecZero(mpCLModel->getAnmMtx(0x27), &pos);
setFootEffectType(effectID, &pos, 0, var_r29);
mDoMtx_multVecZero(mpCLModel->getAnmMtx(0x22), &pos);
setFootEffectType(effectID, &pos, 1, var_r29);
} else {
setFootEffectType(effectID, &current.pos, 0, var_r29);
}
} else if (m34BE == 1) {
mDoMtx_multVecZero(mpCLModel->getAnmMtx(0x22), &pos);
setFootEffectType(effectID, &pos, 0, var_r29);
} else if (m34BE == 2) {
} else if (mFootEffectPosType == 4) {
f32 rnd = cM_rndFX(17.5f);
pos.x = current.pos.x + rnd * cM_scos(current.angle.y);
pos.y = current.pos.y;
pos.z = current.pos.z - rnd * cM_scos(current.angle.y);
setFootEffectType(effectID, &pos, 0, var_r29);
} else if (mFootEffectPosType == 3) {
if (mCurrAttributeCode == dBgS_Attr_GRASS_e || mCurrAttributeCode == dBgS_Attr_WATER_e) {
mDoMtx_multVecZero(mpCLModel->getAnmMtx(0x27), &pos);
setFootEffectType(effectID, &pos, 0, var_r29);
} else if (m34BE == 5) {
setFootEffectType(effectID, &current.pos, 0, 1);
} else if (m34BE == 6) {
mDoMtx_multVecZero(mpCLModel->getAnmMtx(0), &pos);
mDoMtx_multVecZero(mpCLModel->getAnmMtx(0x22), &pos);
setFootEffectType(effectID, &pos, 1, var_r29);
mGndChk.SetPos(&pos);
f32 groundY = dComIfG_Bgsp()->GroundCross(&mGndChk);
if (groundY != -G_CM3D_F_INF) {
pos.y = groundY;
}
setFootEffectType(effectID, &pos, 0, 1);
} else {
setFootEffectType(effectID, &current.pos, 0, var_r29);
}
} else if (mFootEffectPosType == 1) {
mDoMtx_multVecZero(mpCLModel->getAnmMtx(0x22), &pos);
setFootEffectType(effectID, &pos, 0, var_r29);
} else if (mFootEffectPosType == 2) {
mDoMtx_multVecZero(mpCLModel->getAnmMtx(0x27), &pos);
setFootEffectType(effectID, &pos, 0, var_r29);
} else if (mFootEffectPosType == 5) {
setFootEffectType(effectID, &current.pos, 0, 1);
} else if (mFootEffectPosType == 6) {
mDoMtx_multVecZero(mpCLModel->getAnmMtx(0), &pos);
mGndChk.SetPos(&pos);
f32 groundY = dComIfG_Bgsp()->GroundCross(&mGndChk);
if (groundY != -G_CM3D_F_INF) {
pos.y = groundY;
}
setFootEffectType(effectID, &pos, 0, 1);
}
}
@@ -1082,7 +1078,7 @@ void daPy_lk_c::resetFootEffect() {
pFootEffect->setID(-1);
}
m34BE = 0;
setFootEffectPosType(0);
}
/* 8012C1A8-8012C2A4 .text setSwimTail__9daPy_lk_cFv */
@@ -1111,7 +1107,7 @@ void daPy_lk_c::setCutWaterSplash() {
/* 8012C330-8012C45C .text setSwimWaterDrop__9daPy_lk_cFP25daPy_waterDropEcallBack_c */
void daPy_lk_c::setSwimWaterDrop(daPy_waterDropEcallBack_c* callBack) {
f32 tmp = m35D0 + 10.0f;
f32 tmp = mWaterY + 10.0f;
if (checkNoResetFlg1(daPy_lk_c::daPyFlg1_WATER_DROP) || !checkNoResetFlg0(daPy_lk_c::daPyFlg0_UNK80) || (callBack->getPos().y > tmp && !checkModeFlg(ModeFlg_SWIM))) {
if (callBack->getEmitter() == NULL && (callBack->checkReady() || checkNoResetFlg1(daPy_lk_c::daPyFlg1_WATER_DROP))) {
JPABaseEmitter* emitter = dComIfGp_particle_setP1(dPa_name::ID_IT_JN_LK_NURE_POTA00, &callBack->getPos(), NULL, NULL, 0xFF, callBack);
@@ -1123,7 +1119,7 @@ void daPy_lk_c::setSwimWaterDrop(daPy_waterDropEcallBack_c* callBack) {
callBack->offReady();
offNoResetFlg1(daPy_lk_c::daPyFlg1_WATER_DROP);
} else if (checkNoResetFlg0(daPy_lk_c::daPyFlg0_UNK80) && callBack->getPos().y < m35D0) {
} else if (checkNoResetFlg0(daPy_lk_c::daPyFlg0_UNK80) && callBack->getPos().y < mWaterY) {
callBack->end();
if (mCurProc != daPyProc_VOMIT_WAIT_e) {
callBack->onReady();
@@ -1258,11 +1254,11 @@ void daPy_lk_c::setDamageEmitter() {
void daPy_lk_c::endFlameDamageEmitter() {
if (!daPy_dmEcallBack_c::checkFlame()) return;
if (current.pos.y < m35D0 - 10.0f) {
if (current.pos.y < mWaterY - 10.0f) {
for (int i = 0; i < (s32)ARRAY_SIZE(mDmEcallBack); i++) {
cXyz pos;
mDoMtx_multVecZero(mDmEcallBack[i].getMtx(), &pos);
pos.y = m35D0;
pos.y = mWaterY;
dComIfGp_particle_set(dPa_name::ID_AK_JN_EVAPORATION00, &pos);
}
src/d/actor/d_a_player_pushpull.inc
+1 -1
View File
@@ -17,7 +17,7 @@
/* 801514B0-80151644 .text setPushPullKeepData__9daPy_lk_cFQ24dBgW13PushPullLabel */
BOOL daPy_lk_c::setPushPullKeepData(dBgW::PushPullLabel pp_label) {
if (pp_label != dBgW::PPLABEL_NONE) {
if (dComIfGs_getSelectEquip(2) == dItem_POWER_BRACELETS_e) {
if (checkPowerGloveEquip()) {
cLib_onBit<dBgW::PushPullLabel>(pp_label, dBgW::PPLABEL_HEAVY);
}
if (mProcVar0.m3570) {
src/d/actor/d_a_player_ship.inc
+2 -2
View File
@@ -27,7 +27,7 @@
/* 8013F848-8013F8AC .text shipSpecialDemoStart__9daPy_lk_cFv */
BOOL daPy_lk_c::shipSpecialDemoStart() {
if (dComIfGp_event_compulsory(this)) {
mDemo.setDemoType(5);
mDemo.setSpecialDemoType();
return true;
} else {
return false;
@@ -731,7 +731,7 @@ BOOL daPy_lk_c::procShipScope() {
if (checkScopeEnd()) {
procShipPaddle_init();
} else if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x10) && !dComIfGp_event_runCheck() &&
mDemo.getDemoType() == 0)
!checkPlayerDemoMode())
{
shape_angle.y = fopCamM_GetAngleY(dComIfGp_getCamera(mCameraInfoIdx));
iVar2 = 0;
src/d/actor/d_a_player_swim.inc
+14 -14
View File
@@ -121,7 +121,7 @@ BOOL daPy_lk_c::changeSwimProc() {
!checkNoControll() &&
#endif
mDemo.getDemoMode() != daPy_demo_c::DEMO_PFALL_e &&
m35D0 - current.pos.y > m_HIO->mSwim.m.field_0x24
mWaterY - current.pos.y > m_HIO->mSwim.m.field_0x24
) {
dComIfGp_setItemTimeCount(900);
dComIfGp_setItemTimeMax(900);
@@ -162,7 +162,7 @@ BOOL daPy_lk_c::changeSwimProc() {
}
local_18.x = current.pos.x;
local_18.y = m35D0;
local_18.y = mWaterY;
local_18.z = current.pos.z;
fopKyM_createWpillar(&local_18, 1.0f, oldSpeedY, 0);
seStartOnlyReverb(JA_SE_LK_INTO_WATER);
@@ -189,10 +189,10 @@ BOOL daPy_lk_c::changeSwimUpProc() {
deleteEquipItem(TRUE);
}
}
if (m35D0 - current.pos.y < 40.1f + m_HIO->mSwim.m.field_0x28 && speed.y >= 0.0f) {
if (mWaterY - current.pos.y < 40.1f + m_HIO->mSwim.m.field_0x28 && speed.y >= 0.0f) {
if (mCurProc == daPyProc_DEMO_DEAD_e) {
onNoResetFlg0(daPyFlg0_UNK100);
current.pos.y = m35D0;
current.pos.y = mWaterY;
return TRUE;
}
return procSwimUp_init(TRUE);
@@ -213,7 +213,7 @@ void daPy_lk_c::swimOutAfter(BOOL param_1) {
/* 8013D314-8013D354 .text checkSwimFallCheck__9daPy_lk_cFv */
BOOL daPy_lk_c::checkSwimFallCheck() {
if (!checkNoResetFlg0(daPyFlg0_UNK80) || (current.pos.y > m35D0 + 30.1f && !dPa_control_c::isStatus(1))) {
if (!checkNoResetFlg0(daPyFlg0_UNK80) || (current.pos.y > mWaterY + 30.1f && !dPa_control_c::isStatus(1))) {
return TRUE;
}
return FALSE;
@@ -240,8 +240,8 @@ BOOL daPy_lk_c::changeSwimOutProc() {
return procFall_init(1, m_HIO->mWallCatch.m.field_0x54);
}
if (!checkNoResetFlg0(daPyFlg0_UNK80) || (pcVar1 && cBgW_CheckBGround(pcVar1->GetNP()->y) && m35D0 - mAcch.GetGroundH() < m_HIO->mSwim.m.field_0x24 - 5.0f)) {
current.pos.y = m35D0;
if (!checkNoResetFlg0(daPyFlg0_UNK80) || (pcVar1 && cBgW_CheckBGround(pcVar1->GetNP()->y) && mWaterY - mAcch.GetGroundH() < m_HIO->mSwim.m.field_0x24 - 5.0f)) {
current.pos.y = mWaterY;
if (mCurProc == daPyProc_SWIM_MOVE_e && mDirection != DIR_FORWARD) {
current.pos.y += m35C4;
@@ -297,7 +297,7 @@ f32 daPy_lk_c::getSwimTimerRate() {
void daPy_lk_c::setSwimTimerStartStop() {
f32 target = 0.0f;
if (mAcch.GetGroundH() <= m35D0 - 175.0f) {
if (mAcch.GetGroundH() <= mWaterY - 175.0f) {
dComIfGp_startItemSwimTimer();
if (checkNoResetFlg0(daPyFlg0_UNK100)) {
@@ -338,7 +338,7 @@ BOOL daPy_lk_c::procSwimUp_init(BOOL param_1) {
gravity = 0.0f;
speed.y = 0.0f;
current.pos.y = m35D0;
current.pos.y = mWaterY;
setSingleMoveAnime(ANM_SWIMP, m_HIO->mSwim.m.field_0x2C, m_HIO->mSwim.m.field_0x30, m_HIO->mSwim.m.field_0x0, m_HIO->mSwim.m.field_0x38);
@@ -393,7 +393,7 @@ BOOL daPy_lk_c::procSwimUp() {
}
else {
m35C4 = m_HIO->mSwim.m.field_0x3C;
current.pos.y = m35D0;
current.pos.y = mWaterY;
}
}
}
@@ -428,7 +428,7 @@ BOOL daPy_lk_c::procSwimWait_init(BOOL param_1) {
if (mEquipItem != daPyItem_NONE_e) {
deleteEquipItem(TRUE);
}
current.pos.y = m35D0;
current.pos.y = mWaterY;
speed.y = 0.0f;
}
@@ -454,7 +454,7 @@ BOOL daPy_lk_c::procSwimWait() {
}
}
else {
current.pos.y = m35D0;
current.pos.y = mWaterY;
}
if (checkNextModeSwim()) {
@@ -505,7 +505,7 @@ BOOL daPy_lk_c::procSwimMove_init(BOOL param_1) {
deleteEquipItem(TRUE);
}
current.pos.y = m35D0;
current.pos.y = mWaterY;
speed.y = 0.0f;
setSwimTail();
@@ -592,7 +592,7 @@ BOOL daPy_lk_c::procSwimMove() {
}
}
else {
current.pos.y = m35D0;
current.pos.y = mWaterY;
setSwimTail();
}
src/d/actor/d_a_player_sword.inc
+2 -2
View File
@@ -1532,7 +1532,7 @@ BOOL daPy_lk_c::procCutRoll_init() {
mAtCyl.SetR(m35A4 * 0.5f);
m34D0 = m_HIO->mCut.mCutRoll.m.field_0x2;
current.angle.y = shape_angle.y;
m34BE = 4;
setFootEffectPosType(4);
dComIfGp_setPlayerStatus0(0, daPyStts0_SPIN_ATTACK_e);
endFlameDamageEmitter();
return true;
@@ -1964,7 +1964,7 @@ BOOL daPy_lk_c::procJumpCutLand_init() {
}
m34D0 = m_HIO->mCut.mCutJump.m.field_0x4;
current.angle.y = shape_angle.y + 0x8000;
m34BE = 3;
setFootEffectPosType(3);
onResetFlg0(daPyRFlg0_RIGHT_FOOT_ON_GROUND);
onResetFlg0(daPyRFlg0_LEFT_FOOT_ON_GROUND);
if (mEquipItem == dItem_SKULL_HAMMER_e) {
src/d/actor/d_a_player_tact.inc
+2 -2
View File
@@ -207,7 +207,7 @@ BOOL daPy_lk_c::procTactWait_init(int r30) {
if (!dComIfGp_event_compulsory(this, NULL, -1)) {
return FALSE;
}
mDemo.setDemoType(5);
mDemo.setSpecialDemoType();
}
int r31 = checkShipRideUseItem(1);
@@ -683,7 +683,7 @@ BOOL daPy_lk_c::procTactPlayEnd_init(int r30) {
if (r30 == -1) {
dCam_getBody()->EndEventCamera(fopAcM_GetID(this));
fopAcM_orderChangeEvent(this, fopAcM_SearchByID(mTactZevPartnerId), m3494, 0, -1);
mDemo.setDemoType(2);
mDemo.setSystemDemoType();
} else if (r30 == 0) {
dCam_getBody()->EndEventCamera(fopAcM_GetID(this));
fopAcM_create(PROC_WBIRD, NULL, &current.pos, dComIfGp_roomControl_getStayNo());
src/d/actor/d_a_player_vomit.inc
+1 -1
View File
@@ -261,7 +261,7 @@ BOOL daPy_lk_c::procVomitLand_init() {
);
m34D0 = m_HIO->mVomit.m.field_0x6;
mProcVar0.m3570 = 0;
m34BE = 5;
setFootEffectPosType(5);
return true;
}
src/d/actor/d_a_player_whide.inc
+2 -2
View File
@@ -248,8 +248,8 @@ int daPy_lk_c::changeWHideEndProc(cXyz* param_0) {
dComIfGp_setDoStatus(dActStts_SIDLE_e);
dComIfGp_setRStatus(dActStts_CROUCH_e);
if (((!doButton() && (!checkNoResetFlg0(daPyFlg0_UNK10000) || !mAcch.ChkRoofHit())) ||
(!checkUpperAnime(LKANM_BCK_REST) && swordTrigger())) ||
if ((!doButton() && (!checkNoResetFlg0(daPyFlg0_UNK10000) || !mAcch.ChkRoofHit())) ||
(!checkUpperAnime(LKANM_BCK_REST) && swordTrigger()) ||
!checkWHideBackWall(param_0))
{
mVelocity = 0.7f * mMaxNormalSpeed;
src/d/actor/d_a_ship.cpp
+6 -6
View File
@@ -1797,9 +1797,9 @@ BOOL daShip_c::procCannon() {
}
if (m037A == 0 &&
((CPad_CHECK_TRIG_X(0) && dComIfGp_getSelectItem(0) == dItem_BOMB_BAG_e) ||
(CPad_CHECK_TRIG_Y(0) && dComIfGp_getSelectItem(1) == dItem_BOMB_BAG_e) ||
(CPad_CHECK_TRIG_Z(0) && dComIfGp_getSelectItem(2) == dItem_BOMB_BAG_e))) {
((CPad_CHECK_TRIG_X(0) && dComIfGp_getSelectItem(dItemBtn_X_e) == dItem_BOMB_BAG_e) ||
(CPad_CHECK_TRIG_Y(0) && dComIfGp_getSelectItem(dItemBtn_Y_e) == dItem_BOMB_BAG_e) ||
(CPad_CHECK_TRIG_Z(0) && dComIfGp_getSelectItem(dItemBtn_Z_e) == dItem_BOMB_BAG_e))) {
m037A = 30;
if (dComIfGs_getBombNum() == 0) {
mDoAud_seStart(JA_SE_ITEM_TARGET_OUT);
@@ -1895,9 +1895,9 @@ BOOL daShip_c::procCrane() {
if (!dComIfGp_event_runCheck() && !daPy_getPlayerLinkActorClass()->checkNoControll()) {
if (m0398 == mCraneBaseAngle) {
if(std::fabsf(speedF) < 3.0f &&
((CPad_CHECK_HOLD_X(0) && dComIfGp_getSelectItem(0) == dItem_GRAPPLING_HOOK_e) ||
(CPad_CHECK_HOLD_Y(0) && dComIfGp_getSelectItem(1) == dItem_GRAPPLING_HOOK_e) ||
(CPad_CHECK_HOLD_Z(0) && dComIfGp_getSelectItem(2) == dItem_GRAPPLING_HOOK_e))) {
((CPad_CHECK_HOLD_X(0) && dComIfGp_getSelectItem(dItemBtn_X_e) == dItem_GRAPPLING_HOOK_e) ||
(CPad_CHECK_HOLD_Y(0) && dComIfGp_getSelectItem(dItemBtn_Y_e) == dItem_GRAPPLING_HOOK_e) ||
(CPad_CHECK_HOLD_Z(0) && dComIfGp_getSelectItem(dItemBtn_Z_e) == dItem_GRAPPLING_HOOK_e))) {
sVar1 = mRopeCnt;
incRopeCnt(2, 0);
if (mRopeCnt == 250) {
src/d/actor/d_a_spc_item01.cpp
+4 -4
View File
@@ -57,7 +57,7 @@ void daSpcItem01_c::set_mtx() {
cXyz scaleVec = scale;
f32 offsetY = 0.0f;
switch (m_itemNo) {
case BOKO_BELT:
case dItem_KNIGHTS_CREST_e:
offsetY = -24.0f;
break;
}
@@ -149,7 +149,7 @@ BOOL daSpcItem01_c::_execute() {
/* 8015DFE8-8015E070 .text set_effect__13daSpcItem01_cFv */
void daSpcItem01_c::set_effect() {
if (cLib_checkBit(field_0x644, (u16)0x01) && dItem_data::checkAppearEffect(m_itemNo) && !field_0x642 && m_itemNo != BOKO_BELT) {
if (cLib_checkBit(field_0x644, (u16)0x01) && dItem_data::checkAppearEffect(m_itemNo) && !field_0x642 && m_itemNo != dItem_KNIGHTS_CREST_e) {
dComIfGp_particle_setSimple(dItem_data::getAppearEffect(m_itemNo), &current.pos);
}
}
@@ -166,7 +166,7 @@ void daSpcItem01_c::scale_anim() {
/* 8015E0D8-8015E11C .text anim_play__13daSpcItem01_cFv */
void daSpcItem01_c::anim_play() {
f32 animPlayParam = 1.0f;
if (m_itemNo == BOKO_BELT) {
if (m_itemNo == dItem_KNIGHTS_CREST_e) {
animPlayParam = 0.0f;
}
animPlay(1.0f, 1.0f, 1.0f, 1.0f, animPlayParam);
@@ -231,7 +231,7 @@ BOOL daSpcItem01_c::_draw() {
/* 8015E2A8-8015E368 .text setTevStr__13daSpcItem01_cFv */
void daSpcItem01_c::setTevStr() {
if (m_itemNo == BOKO_BELT) {
if (m_itemNo == dItem_KNIGHTS_CREST_e) {
dKy_getEnvlight().settingTevStruct(TEV_TYPE_BG1, &current.pos, &tevStr);
} else {
dKy_getEnvlight().settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
src/d/d_com_inf_game.cpp
+25 -25
View File
@@ -961,58 +961,58 @@ u8 dComIfGs_checkGetItemNum(u8 i_itemNo) {
}
break;
case dItem_SKULL_NECKLACE_e:
for (int i = 0; i < 8; i++) {
if (dComIfGs_getBeast(i) == dItem_SKULL_NECKLACE_e) {
get_item = dComIfGs_getBeastNum(0);
for (int beastIdx = 0; beastIdx < dBeastIdx_COUNT_e; beastIdx++) {
if (dComIfGs_getBeast(beastIdx) == dItem_SKULL_NECKLACE_e) {
get_item = dComIfGs_getBeastNum(dBeastIdx_SKULL_NECKLACE_e);
}
}
break;
case dItem_BOKOBABA_SEED_e:
for (int i = 0; i < 8; i++) {
if (dComIfGs_getBeast(i) == dItem_BOKOBABA_SEED_e) {
get_item = dComIfGs_getBeastNum(1);
for (int beastIdx = 0; beastIdx < dBeastIdx_COUNT_e; beastIdx++) {
if (dComIfGs_getBeast(beastIdx) == dItem_BOKOBABA_SEED_e) {
get_item = dComIfGs_getBeastNum(dBeastIdx_BOKOBABA_SEED_e);
}
}
break;
case dItem_GOLDEN_FEATHER_e:
for (int i = 0; i < 8; i++) {
if (dComIfGs_getBeast(i) == dItem_GOLDEN_FEATHER_e) {
get_item = dComIfGs_getBeastNum(2);
for (int beastIdx = 0; beastIdx < dBeastIdx_COUNT_e; beastIdx++) {
if (dComIfGs_getBeast(beastIdx) == dItem_GOLDEN_FEATHER_e) {
get_item = dComIfGs_getBeastNum(dBeastIdx_GOLDEN_FEATHER_e);
}
}
break;
case BOKO_BELT:
for (int i = 0; i < 8; i++) {
if (dComIfGs_getBeast(i) == BOKO_BELT) {
get_item = dComIfGs_getBeastNum(3);
case dItem_KNIGHTS_CREST_e:
for (int beastIdx = 0; beastIdx < dBeastIdx_COUNT_e; beastIdx++) {
if (dComIfGs_getBeast(beastIdx) == dItem_KNIGHTS_CREST_e) {
get_item = dComIfGs_getBeastNum(dBeastIdx_KNIGHTS_CREST_e);
}
}
break;
case dItem_RED_JELLY_e:
for (int i = 0; i < 8; i++) {
if (dComIfGs_getBeast(i) == dItem_RED_JELLY_e) {
get_item = dComIfGs_getBeastNum(4);
for (int beastIdx = 0; beastIdx < dBeastIdx_COUNT_e; beastIdx++) {
if (dComIfGs_getBeast(beastIdx) == dItem_RED_JELLY_e) {
get_item = dComIfGs_getBeastNum(dBeastIdx_RED_JELLY_e);
}
}
break;
case dItem_GREEN_JELLY_e:
for (int i = 0; i < 8; i++) {
if (dComIfGs_getBeast(i) == dItem_GREEN_JELLY_e) {
get_item = dComIfGs_getBeastNum(5);
for (int beastIdx = 0; beastIdx < dBeastIdx_COUNT_e; beastIdx++) {
if (dComIfGs_getBeast(beastIdx) == dItem_GREEN_JELLY_e) {
get_item = dComIfGs_getBeastNum(dBeastIdx_GREEN_JELLY_e);
}
}
break;
case dItem_BLUE_JELLY_e:
for (int i = 0; i < 8; i++) {
if (dComIfGs_getBeast(i) == dItem_BLUE_JELLY_e) {
get_item = dComIfGs_getBeastNum(6);
for (int beastIdx = 0; beastIdx < dBeastIdx_COUNT_e; beastIdx++) {
if (dComIfGs_getBeast(beastIdx) == dItem_BLUE_JELLY_e) {
get_item = dComIfGs_getBeastNum(dBeastIdx_BLUE_JELLY_e);
}
}
break;
case dItem_JOY_PENDANT_e:
for (int i = 0; i < 8; i++) {
if (dComIfGs_getBeast(i) == dItem_JOY_PENDANT_e) {
get_item = dComIfGs_getBeastNum(7);
for (int beastIdx = 0; beastIdx < dBeastIdx_COUNT_e; beastIdx++) {
if (dComIfGs_getBeast(beastIdx) == dItem_JOY_PENDANT_e) {
get_item = dComIfGs_getBeastNum(dBeastIdx_JOY_PENDANT_e);
}
}
break;
src/d/d_item.cpp
+27 -27
View File
@@ -679,8 +679,8 @@ void item_func_triple_heart() {
/* 800C3200-800C3258 .text item_func_pendant__Fv */
void item_func_pendant() {
dComIfGs_setBeastItem(dItem_JOY_PENDANT_e);
dComIfGs_onGetItemBeast(0x7);
dComIfGp_setItemBeastNumCount(0x7, 1);
dComIfGs_onGetItemBeast(dBeastIdx_JOY_PENDANT_e);
dComIfGp_setItemBeastNumCount(dBeastIdx_JOY_PENDANT_e, 1);
}
/* 800C3258-800C329C .text item_func_telescope__Fv */
@@ -899,50 +899,50 @@ void item_func_grass_ball() {
/* 800C3D00-800C3D58 .text item_func_skull_necklace__Fv */
void item_func_skull_necklace() {
dComIfGs_setBeastItem(dItem_SKULL_NECKLACE_e);
dComIfGs_onGetItemBeast(0x0);
dComIfGp_setItemBeastNumCount(0x0, 1);
dComIfGs_onGetItemBeast(dBeastIdx_SKULL_NECKLACE_e);
dComIfGp_setItemBeastNumCount(dBeastIdx_SKULL_NECKLACE_e, 1);
}
/* 800C3D58-800C3DB0 .text item_func_bokobaba_seed__Fv */
void item_func_bokobaba_seed() {
dComIfGs_setBeastItem(dItem_BOKOBABA_SEED_e);
dComIfGs_onGetItemBeast(0x1);
dComIfGp_setItemBeastNumCount(0x1, 1);
dComIfGs_onGetItemBeast(dBeastIdx_BOKOBABA_SEED_e);
dComIfGp_setItemBeastNumCount(dBeastIdx_BOKOBABA_SEED_e, 1);
}
/* 800C3DB0-800C3E08 .text item_func_golden_feather__Fv */
void item_func_golden_feather() {
dComIfGs_setBeastItem(dItem_GOLDEN_FEATHER_e);
dComIfGs_onGetItemBeast(0x2);
dComIfGp_setItemBeastNumCount(0x2, 1);
dComIfGs_onGetItemBeast(dBeastIdx_GOLDEN_FEATHER_e);
dComIfGp_setItemBeastNumCount(dBeastIdx_GOLDEN_FEATHER_e, 1);
}
/* 800C3E08-800C3E60 .text item_func_boko_belt__Fv */
void item_func_boko_belt() {
dComIfGs_setBeastItem(BOKO_BELT);
dComIfGs_onGetItemBeast(0x3);
dComIfGp_setItemBeastNumCount(0x3, 1);
dComIfGs_setBeastItem(dItem_KNIGHTS_CREST_e);
dComIfGs_onGetItemBeast(dBeastIdx_KNIGHTS_CREST_e);
dComIfGp_setItemBeastNumCount(dBeastIdx_KNIGHTS_CREST_e, 1);
}
/* 800C3E60-800C3EB8 .text item_func_red_jerry__Fv */
void item_func_red_jerry() {
dComIfGs_setBeastItem(dItem_RED_JELLY_e);
dComIfGs_onGetItemBeast(0x4);
dComIfGp_setItemBeastNumCount(0x4, 1);
dComIfGs_onGetItemBeast(dBeastIdx_RED_JELLY_e);
dComIfGp_setItemBeastNumCount(dBeastIdx_RED_JELLY_e, 1);
}
/* 800C3EB8-800C3F10 .text item_func_green_jerry__Fv */
void item_func_green_jerry() {
dComIfGs_setBeastItem(dItem_GREEN_JELLY_e);
dComIfGs_onGetItemBeast(0x5);
dComIfGp_setItemBeastNumCount(0x5, 1);
dComIfGs_onGetItemBeast(dBeastIdx_GREEN_JELLY_e);
dComIfGp_setItemBeastNumCount(dBeastIdx_GREEN_JELLY_e, 1);
}
/* 800C3F10-800C3F68 .text item_func_blue_jerry__Fv */
void item_func_blue_jerry() {
dComIfGs_setBeastItem(dItem_BLUE_JELLY_e);
dComIfGs_onGetItemBeast(0x6);
dComIfGp_setItemBeastNumCount(0x6, 1);
dComIfGs_onGetItemBeast(dBeastIdx_BLUE_JELLY_e);
dComIfGp_setItemBeastNumCount(dBeastIdx_BLUE_JELLY_e, 1);
}
/* 800C3F68-800C3F98 .text item_func_map__Fv */
@@ -2012,7 +2012,7 @@ int item_getcheck_func_triple_heart() {
/* 800C655C-800C658C .text item_getcheck_func_pendant__Fv */
int item_getcheck_func_pendant() {
return dComIfGs_isGetItemBeast(0x7);
return dComIfGs_isGetItemBeast(dBeastIdx_JOY_PENDANT_e);
}
/* 800C658C-800C65C0 .text item_getcheck_func_telescope__Fv */
@@ -2172,37 +2172,37 @@ int item_getcheck_func_grass_ball() {
/* 800C6B28-800C6B58 .text item_getcheck_func_skull_necklace__Fv */
int item_getcheck_func_skull_necklace() {
return dComIfGs_isGetItemBeast(0x0);
return dComIfGs_isGetItemBeast(dBeastIdx_SKULL_NECKLACE_e);
}
/* 800C6B58-800C6B88 .text item_getcheck_func_bokobaba_seed__Fv */
int item_getcheck_func_bokobaba_seed() {
return dComIfGs_isGetItemBeast(0x1);
return dComIfGs_isGetItemBeast(dBeastIdx_BOKOBABA_SEED_e);
}
/* 800C6B88-800C6BB8 .text item_getcheck_func_golden_feather__Fv */
int item_getcheck_func_golden_feather() {
return dComIfGs_isGetItemBeast(0x2);
return dComIfGs_isGetItemBeast(dBeastIdx_GOLDEN_FEATHER_e);
}
/* 800C6BB8-800C6BE8 .text item_getcheck_func_boko_belt__Fv */
int item_getcheck_func_boko_belt() {
return dComIfGs_isGetItemBeast(0x3);
return dComIfGs_isGetItemBeast(dBeastIdx_KNIGHTS_CREST_e);
}
/* 800C6BE8-800C6C18 .text item_getcheck_func_red_jerry__Fv */
int item_getcheck_func_red_jerry() {
return dComIfGs_isGetItemBeast(0x4);
return dComIfGs_isGetItemBeast(dBeastIdx_RED_JELLY_e);
}
/* 800C6C18-800C6C48 .text item_getcheck_func_green_jerry__Fv */
int item_getcheck_func_green_jerry() {
return dComIfGs_isGetItemBeast(0x5);
return dComIfGs_isGetItemBeast(dBeastIdx_GREEN_JELLY_e);
}
/* 800C6C48-800C6C78 .text item_getcheck_func_blue_jerry__Fv */
int item_getcheck_func_blue_jerry() {
return dComIfGs_isGetItemBeast(0x6);
return dComIfGs_isGetItemBeast(dBeastIdx_BLUE_JELLY_e);
}
/* 800C6C78-800C6CA8 .text item_getcheck_func_map__Fv */
@@ -2654,7 +2654,7 @@ BOOL isArrow(u8 itemNo) {
BOOL isEmono(u8 itemNo) {
BOOL isEmono = FALSE;
if (itemNo == dItem_JOY_PENDANT_e || itemNo == dItem_SKULL_NECKLACE_e || itemNo == dItem_BOKOBABA_SEED_e || itemNo == dItem_GOLDEN_FEATHER_e ||
itemNo == BOKO_BELT || itemNo == dItem_RED_JELLY_e || itemNo == dItem_GREEN_JELLY_e || itemNo == dItem_BLUE_JELLY_e)
itemNo == dItem_KNIGHTS_CREST_e || itemNo == dItem_RED_JELLY_e || itemNo == dItem_GREEN_JELLY_e || itemNo == dItem_BLUE_JELLY_e)
{
isEmono = TRUE;
}
@@ -2694,7 +2694,7 @@ BOOL isLimitedItem(u8 itemNo) {
BOOL isNonSavedEmono(u8 itemNo) {
BOOL isEmono = FALSE;
if (itemNo == dItem_JOY_PENDANT_e || itemNo == dItem_SKULL_NECKLACE_e || itemNo == dItem_BOKOBABA_SEED_e || itemNo == dItem_GOLDEN_FEATHER_e ||
itemNo == BOKO_BELT || itemNo == dItem_RED_JELLY_e || itemNo == dItem_GREEN_JELLY_e) // No dItem_BLUE_JELLY_e
itemNo == dItem_KNIGHTS_CREST_e || itemNo == dItem_RED_JELLY_e || itemNo == dItem_GREEN_JELLY_e) // No dItem_BLUE_JELLY_e
{
isEmono = TRUE;
}
src/d/d_item_data.cpp
+4 -4
View File
@@ -1752,7 +1752,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = {
/* mHeapSize */ 0x2000
},
{
// 0x48: BOKO_BELT
// 0x48: dItem_KNIGHTS_CREST_e
/* mArcname */ item_arcname_tbl[ARCNAME_IDX_VBELT],
/* mTexture */ item_texture_tbl[TEXTURE_IDX_BEAST_04],
/* mBmdIdx */ VBELT_BDL_VBELT,
@@ -5732,7 +5732,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
#endif
},
{
// 0x48: BOKO_BELT
// 0x48: dItem_KNIGHTS_CREST_e
/* mArc */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
/* mBmdIdx */ ALWAYS_BDL_VBELL,
/* mSrtIdx */ ALWAYS_BTK_VBELL,
@@ -8680,7 +8680,7 @@ dItem_data_item_info dItem_data::item_info[0x100] = {
0x00,
},
{
// 0x48: BOKO_BELT
// 0x48: dItem_KNIGHTS_CREST_e
0x32,
0x46,
0x28,
@@ -10332,7 +10332,7 @@ dItem_data_effect_info dItem_data::effect_info[] = {
dPa_name::ID_AK_JN_HEARTVESSEL,
},
{
// 0x48: BOKO_BELT
// 0x48: dItem_KNIGHTS_CREST_e
dPa_name::ID_SCENE_END,
dPa_name::ID_AK_JN_HEARTVESSEL,
},
src/d/d_meter.cpp
+162 -188
View File
@@ -2523,10 +2523,10 @@ void dMeter_xyInit(sub_meter_class* i_Meter) {
for (s32 i = 0; i < 8; i++) {
dMenu_baitNum[i] = dComIfGs_getBaitNum(i);
}
for (int i = 0; i < 3; i++) {
dComIfGp_setSelectItem(i);
i_Meter->field_0x3021[i] = dComIfGp_getSelectItem(i);
dMeter_xyItemChange(i_Meter, i);
for (int itemBtn = 0; itemBtn < dItemBtn_COUNT_e; itemBtn++) {
dComIfGp_setSelectItem(itemBtn);
i_Meter->field_0x3021[itemBtn] = dComIfGp_getSelectItem(itemBtn);
dMeter_xyItemChange(i_Meter, itemBtn);
}
}
@@ -2539,40 +2539,40 @@ void dMeter_xyMove(sub_meter_class* i_Meter) {
bVar2 = true;
bVar3 = false;
for (s32 i = 0; i < 3; i++) {
if (i_Meter->field_0x3021[i] != dComIfGp_getSelectItem(i)) {
dMeter_xyItemChange(i_Meter, i);
for (int itemBtn = 0; itemBtn < dItemBtn_COUNT_e; itemBtn++) {
if (i_Meter->field_0x3021[itemBtn] != dComIfGp_getSelectItem(itemBtn)) {
dMeter_xyItemChange(i_Meter, itemBtn);
bVar2 = false;
#if VERSION == VERSION_DEMO
if ((i_Meter->field_0x3021[i] == dItem_MAGIC_ARROW_e) || (i_Meter->field_0x3021[i] == dItem_LIGHT_ARROW_e))
if ((i_Meter->field_0x3021[itemBtn] == dItem_MAGIC_ARROW_e) || (i_Meter->field_0x3021[itemBtn] == dItem_LIGHT_ARROW_e))
#else
if ((dComIfGp_getSelectItem(i) != dItem_MAGIC_ARROW_e) && (dComIfGp_getSelectItem(i) != dItem_LIGHT_ARROW_e))
if ((dComIfGp_getSelectItem(itemBtn) != dItem_MAGIC_ARROW_e) && (dComIfGp_getSelectItem(itemBtn) != dItem_LIGHT_ARROW_e))
#endif
{
i_Meter->field_0x2320[i].pane->hide();
i_Meter->field_0x23c8[i].pane->hide();
i_Meter->field_0x2470[i].pane->hide();
i_Meter->field_0x2320[i].mUserArea = 0;
i_Meter->field_0x2320[itemBtn].pane->hide();
i_Meter->field_0x23c8[itemBtn].pane->hide();
i_Meter->field_0x2470[itemBtn].pane->hide();
i_Meter->field_0x2320[itemBtn].mUserArea = 0;
}
i_Meter->field_0x3021[i] = dComIfGp_getSelectItem(i);
i_Meter->field_0x3021[itemBtn] = dComIfGp_getSelectItem(itemBtn);
}
}
if (bVar2) {
dMeter_xyItemCountUp(i_Meter);
}
dMeter_xyTrans(i_Meter);
for (s32 i = 0; i < 3; i++) {
dVar1 = g_dComIfG_gameInfo.play.mSelectItem[i];
for (int itemBtn = 0; itemBtn < dItemBtn_COUNT_e; itemBtn++) {
dVar1 = dComIfGp_getSelectItem(itemBtn);
if ((dVar1 == dItem_MAGIC_ARROW_e) || (dVar1 == dItem_LIGHT_ARROW_e)) {
dMeter_xyBowLightAnime(i_Meter, i);
dMeter_xyBowLightAnime(i_Meter, itemBtn);
} else if (dVar1 == dItem_FOREST_WATER_e) {
bVar3 = true;
local_38.set(i_Meter->field_0x2080[i].mPosCenter.x - 320.0f, i_Meter->field_0x2080[i].mPosCenter.y - 240.0f, 0.0f);
local_38.set(i_Meter->field_0x2080[itemBtn].mPosCenter.x - 320.0f, i_Meter->field_0x2080[itemBtn].mPosCenter.y - 240.0f, 0.0f);
for (s32 j = 0; j < 2; j++) {
if (i_Meter->field_0x2f2c[j] != NULL) {
i_Meter->field_0x2f2c[j]->setGlobalTranslation(local_38.x, local_38.y, local_38.z);
i_Meter->field_0x2f2c[j]->playDrawParticle();
i_Meter->field_0x2f2c[j]->setGlobalAlpha(i_Meter->field_0x2080[i].mNowAlpha);
i_Meter->field_0x2f2c[j]->setGlobalAlpha(i_Meter->field_0x2080[itemBtn].mNowAlpha);
} else {
i_Meter->field_0x2f2c[j] = dComIfGp_particle_set2DmenuFore(dPa_name::ID_HM_J2_RUPYLIGHT, &local_38);
}
@@ -2611,119 +2611,96 @@ void dMeter_xyDraw(sub_meter_class* i_Meter) {
}
/* 801F5308-801F543C .text dMeter_xyEquipItem__Fi */
int dMeter_xyEquipItem(int param_1) {
u8 dVar2;
u8 uVar3;
param_1 = dComIfGs_getSelectItem(param_1);
if (param_1 < dInvSlot_ItemLast_e) {
dVar2 = g_dComIfG_gameInfo.save.getPlayer().getItem().getItem(param_1);
} else if (param_1 < dInvSlot_BeastFirst_e) {
dVar2 = dItem_NONE_e;
} else if (param_1 < dInvSlot_BeastLast_e) {
dVar2 = dComIfGs_getItemBeast(param_1 - dInvSlot_BeastFirst_e);
} else if (param_1 < dInvSlot_BaitFirst_e) {
dVar2 = dItem_NONE_e;
} else if (param_1 < dInvSlot_BaitLast_e) {
dVar2 = dComIfGs_getItemBait(param_1 - dInvSlot_BaitFirst_e);
} else if (param_1 < dInvSlot_ReserveFirst_e) {
dVar2 = dItem_NONE_e;
} else if (param_1 < dInvSlot_ReserveLast_e) {
dVar2 = dComIfGs_getItemReserve(param_1 - dInvSlot_ReserveFirst_e);
} else {
dVar2 = dItem_NONE_e;
}
uVar3 = 0;
switch (dVar2) {
int dMeter_xyEquipItem(int i_itemBtn) {
int invIdx = dComIfGs_getSelectItem(i_itemBtn);
u8 itemNo = dComIfGs_getItem(invIdx);
u8 beastIdx = 0;
switch (itemNo) {
case dItem_SKULL_NECKLACE_e:
uVar3 = 0;
beastIdx = dBeastIdx_SKULL_NECKLACE_e;
break;
case dItem_BOKOBABA_SEED_e:
uVar3 = 1;
beastIdx = dBeastIdx_BOKOBABA_SEED_e;
break;
case dItem_GOLDEN_FEATHER_e:
uVar3 = 2;
beastIdx = dBeastIdx_GOLDEN_FEATHER_e;
break;
case BOKO_BELT:
uVar3 = 3;
case dItem_KNIGHTS_CREST_e:
beastIdx = dBeastIdx_KNIGHTS_CREST_e;
break;
case dItem_RED_JELLY_e:
uVar3 = 4;
beastIdx = dBeastIdx_RED_JELLY_e;
break;
case dItem_GREEN_JELLY_e:
uVar3 = 5;
beastIdx = dBeastIdx_GREEN_JELLY_e;
break;
case dItem_BLUE_JELLY_e:
uVar3 = 6;
beastIdx = dBeastIdx_BLUE_JELLY_e;
break;
case dItem_JOY_PENDANT_e:
uVar3 = 7;
beastIdx = dBeastIdx_JOY_PENDANT_e;
break;
}
return uVar3;
return beastIdx;
}
/* 801F543C-801F57B0 .text dMeter_xyItemNumberSet__FP15sub_meter_classi */
void dMeter_xyItemNumberSet(sub_meter_class* i_Meter, int param_2) {
if ((dComIfGp_getSelectItem(param_2) == CAMERA) || (dComIfGp_getSelectItem(param_2) == CAMERA2)) {
dMeter_PaneHide(&i_Meter->field_0x1f30[param_2]);
dMeter_PaneShow(&i_Meter->field_0x1fd8[param_2]);
dMeter_numberSet(i_Meter->field_0x1fd8[param_2].pane, dComIfGs_getPictureNum());
dMeter_numberColor((J2DPicture*)i_Meter->field_0x1fd8[param_2].pane, dComIfGs_getPictureNum(), 3);
} else if ((dComIfGp_getSelectItem(param_2) == dItem_BOW_e) ||
(dComIfGp_getSelectItem(param_2) == dItem_MAGIC_ARROW_e || (dComIfGp_getSelectItem(param_2) == dItem_LIGHT_ARROW_e)))
void dMeter_xyItemNumberSet(sub_meter_class* i_Meter, int i_itemBtn) {
if ((dComIfGp_getSelectItem(i_itemBtn) == CAMERA) || (dComIfGp_getSelectItem(i_itemBtn) == CAMERA2)) {
dMeter_PaneHide(&i_Meter->field_0x1f30[i_itemBtn]);
dMeter_PaneShow(&i_Meter->field_0x1fd8[i_itemBtn]);
dMeter_numberSet(i_Meter->field_0x1fd8[i_itemBtn].pane, dComIfGs_getPictureNum());
dMeter_numberColor((J2DPicture*)i_Meter->field_0x1fd8[i_itemBtn].pane, dComIfGs_getPictureNum(), 3);
} else if ((dComIfGp_getSelectItem(i_itemBtn) == dItem_BOW_e) ||
(dComIfGp_getSelectItem(i_itemBtn) == dItem_MAGIC_ARROW_e || (dComIfGp_getSelectItem(i_itemBtn) == dItem_LIGHT_ARROW_e)))
{
dMeter_PaneShow(&i_Meter->field_0x1f30[param_2]);
dMeter_PaneShow(&i_Meter->field_0x1fd8[param_2]);
dMeter_PaneShow(&i_Meter->field_0x1f30[i_itemBtn]);
dMeter_PaneShow(&i_Meter->field_0x1fd8[i_itemBtn]);
if (dComIfGs_getArrowNum() < 10) {
dMeter_PaneHide(&i_Meter->field_0x1f30[param_2]);
dMeter_PaneHide(&i_Meter->field_0x1f30[i_itemBtn]);
} else {
dMeter_numberSet(i_Meter->field_0x1f30[param_2].pane, dComIfGs_getArrowNum() / 10);
dMeter_numberColor((J2DPicture*)i_Meter->field_0x1f30[param_2].pane, dComIfGs_getArrowNum(), dComIfGs_getArrowMax());
dMeter_numberSet(i_Meter->field_0x1f30[i_itemBtn].pane, dComIfGs_getArrowNum() / 10);
dMeter_numberColor((J2DPicture*)i_Meter->field_0x1f30[i_itemBtn].pane, dComIfGs_getArrowNum(), dComIfGs_getArrowMax());
}
dMeter_numberSet(i_Meter->field_0x1fd8[param_2].pane, dComIfGs_getArrowNum() % 10);
dMeter_numberColor((J2DPicture*)i_Meter->field_0x1fd8[param_2].pane, dComIfGs_getArrowNum(), dComIfGs_getArrowMax());
} else if (dComIfGp_getSelectItem(param_2) == dItem_BOMB_BAG_e) {
dMeter_PaneShow(&i_Meter->field_0x1f30[param_2]);
dMeter_PaneShow(&i_Meter->field_0x1fd8[param_2]);
dMeter_numberSet(i_Meter->field_0x1fd8[i_itemBtn].pane, dComIfGs_getArrowNum() % 10);
dMeter_numberColor((J2DPicture*)i_Meter->field_0x1fd8[i_itemBtn].pane, dComIfGs_getArrowNum(), dComIfGs_getArrowMax());
} else if (dComIfGp_getSelectItem(i_itemBtn) == dItem_BOMB_BAG_e) {
dMeter_PaneShow(&i_Meter->field_0x1f30[i_itemBtn]);
dMeter_PaneShow(&i_Meter->field_0x1fd8[i_itemBtn]);
if (dComIfGs_getBombNum() < 10) {
dMeter_PaneHide(&i_Meter->field_0x1f30[param_2]);
dMeter_PaneHide(&i_Meter->field_0x1f30[i_itemBtn]);
} else {
dMeter_numberSet(i_Meter->field_0x1f30[param_2].pane, dComIfGs_getBombNum() / 10);
dMeter_numberColor((J2DPicture*)i_Meter->field_0x1f30[param_2].pane, dComIfGs_getBombNum(), dComIfGs_getBombMax());
dMeter_numberSet(i_Meter->field_0x1f30[i_itemBtn].pane, dComIfGs_getBombNum() / 10);
dMeter_numberColor((J2DPicture*)i_Meter->field_0x1f30[i_itemBtn].pane, dComIfGs_getBombNum(), dComIfGs_getBombMax());
}
dMeter_numberSet(i_Meter->field_0x1fd8[param_2].pane, dComIfGs_getBombNum() % 10);
dMeter_numberColor((J2DPicture*)i_Meter->field_0x1fd8[param_2].pane, dComIfGs_getBombNum(), dComIfGs_getBombMax());
} else {
if ((dComIfGs_getSelectItem(param_2) >= dInvSlot_BeastFirst_e) && (dComIfGs_getSelectItem(param_2) <= dInvSlot_BeastLast_e - 1)) {
dMeter_PaneShow(&i_Meter->field_0x1f30[param_2]);
dMeter_PaneShow(&i_Meter->field_0x1fd8[param_2]);
int iVar3 = dMeter_xyEquipItem(param_2);
if (dComIfGs_getBeastNum(iVar3) < 10) {
dMeter_PaneHide(&i_Meter->field_0x1f30[param_2]);
} else {
dMeter_numberSet(i_Meter->field_0x1f30[param_2].pane, dComIfGs_getBeastNum(iVar3) / 10);
dMeter_numberColor((J2DPicture*)i_Meter->field_0x1f30[param_2].pane, dComIfGs_getBeastNum(iVar3), 99);
}
dMeter_numberSet(i_Meter->field_0x1fd8[param_2].pane, dComIfGs_getBeastNum(iVar3) % 10);
dMeter_numberColor((J2DPicture*)i_Meter->field_0x1fd8[param_2].pane, dComIfGs_getBeastNum(iVar3), 99);
dMeter_numberSet(i_Meter->field_0x1fd8[i_itemBtn].pane, dComIfGs_getBombNum() % 10);
dMeter_numberColor((J2DPicture*)i_Meter->field_0x1fd8[i_itemBtn].pane, dComIfGs_getBombNum(), dComIfGs_getBombMax());
} else if ((dComIfGs_getSelectItem(i_itemBtn) >= dInvSlot_BeastFirst_e) && (dComIfGs_getSelectItem(i_itemBtn) <= dInvSlot_BeastLast_e - 1)) {
dMeter_PaneShow(&i_Meter->field_0x1f30[i_itemBtn]);
dMeter_PaneShow(&i_Meter->field_0x1fd8[i_itemBtn]);
int beastIdx = dMeter_xyEquipItem(i_itemBtn);
if (dComIfGs_getBeastNum(beastIdx) < 10) {
dMeter_PaneHide(&i_Meter->field_0x1f30[i_itemBtn]);
} else {
if ((dComIfGs_getSelectItem(param_2) >= dInvSlot_BaitFirst_e) && (dComIfGs_getSelectItem(param_2) <= dInvSlot_BaitLast_e - 1)) {
if (dComIfGp_getSelectItem(param_2) == dItem_HYOI_PEAR_e) {
dMeter_PaneHide(&i_Meter->field_0x1f30[param_2]);
dMeter_PaneHide(&i_Meter->field_0x1fd8[param_2]);
} else {
dMeter_PaneHide(&i_Meter->field_0x1f30[param_2]);
dMeter_PaneShow(&i_Meter->field_0x1fd8[param_2]);
dMeter_numberSet(i_Meter->field_0x1fd8[param_2].pane, dComIfGs_getBaitNum(dComIfGs_getSelectItem(param_2) - dInvSlot_BaitFirst_e));
dMeter_numberColor(
(J2DPicture*)i_Meter->field_0x1fd8[param_2].pane, dComIfGs_getBaitNum(dComIfGs_getSelectItem(param_2) - dInvSlot_BaitFirst_e), 3
);
}
dMeter_numberSet(i_Meter->field_0x1f30[i_itemBtn].pane, dComIfGs_getBeastNum(beastIdx) / 10);
dMeter_numberColor((J2DPicture*)i_Meter->field_0x1f30[i_itemBtn].pane, dComIfGs_getBeastNum(beastIdx), 99);
}
dMeter_numberSet(i_Meter->field_0x1fd8[i_itemBtn].pane, dComIfGs_getBeastNum(beastIdx) % 10);
dMeter_numberColor((J2DPicture*)i_Meter->field_0x1fd8[i_itemBtn].pane, dComIfGs_getBeastNum(beastIdx), 99);
} else {
if ((dComIfGs_getSelectItem(i_itemBtn) >= dInvSlot_BaitFirst_e) && (dComIfGs_getSelectItem(i_itemBtn) <= dInvSlot_BaitLast_e - 1)) {
if (dComIfGp_getSelectItem(i_itemBtn) == dItem_HYOI_PEAR_e) {
dMeter_PaneHide(&i_Meter->field_0x1f30[i_itemBtn]);
dMeter_PaneHide(&i_Meter->field_0x1fd8[i_itemBtn]);
} else {
dMeter_PaneHide(&i_Meter->field_0x1f30[param_2]);
dMeter_PaneHide(&i_Meter->field_0x1fd8[param_2]);
dMeter_PaneHide(&i_Meter->field_0x1f30[i_itemBtn]);
dMeter_PaneShow(&i_Meter->field_0x1fd8[i_itemBtn]);
dMeter_numberSet(i_Meter->field_0x1fd8[i_itemBtn].pane, dComIfGs_getBaitNum(dComIfGs_getSelectItem(i_itemBtn) - dInvSlot_BaitFirst_e));
dMeter_numberColor(i_Meter->field_0x1fd8[i_itemBtn].pane, dComIfGs_getBaitNum(dComIfGs_getSelectItem(i_itemBtn) - dInvSlot_BaitFirst_e), 3);
}
} else {
dMeter_PaneHide(&i_Meter->field_0x1f30[i_itemBtn]);
dMeter_PaneHide(&i_Meter->field_0x1fd8[i_itemBtn]);
}
}
}
@@ -2762,7 +2739,6 @@ void dMeter_xyItemCountUp(sub_meter_class* i_Meter) {
bool bVar3;
s16 sVar4;
s16 uVar5;
s32 uVar8;
bVar3 = false;
static u8 arrowMax = dComIfGs_getArrowMax();
@@ -2814,97 +2790,97 @@ void dMeter_xyItemCountUp(sub_meter_class* i_Meter) {
bombMax = dComIfGs_getBombMax();
bVar3 = 1;
}
for (s32 i = 0; i < 8; i++) {
if (dComIfGp_getItemBeastNumCount(i) != 0) {
sVar4 = dComIfGs_getBeastNum(i) + dComIfGp_getItemBeastNumCount(i);
dComIfGp_clearItemBeastNumCount(i);
for (int beastIdx = 0; beastIdx < dBeastIdx_COUNT_e; beastIdx++) {
if (dComIfGp_getItemBeastNumCount(beastIdx) != 0) {
sVar4 = dComIfGs_getBeastNum(beastIdx) + dComIfGp_getItemBeastNumCount(beastIdx);
dComIfGp_clearItemBeastNumCount(beastIdx);
if (sVar4 <= 0) {
dComIfGs_setBeastNum(i, 0);
for (s32 j = 0; j < 3; j++) {
if (dComIfGp_getSelectItem(j) == fopMsgM_itemNumIdx(i + 0x18)) {
dMeter_PaneHide(&i_Meter->field_0x2080[j]);
dMeter_PaneHide(&i_Meter->field_0x2128[j]);
dMeter_PaneHide(&i_Meter->field_0x1f30[j]);
dMeter_PaneHide(&i_Meter->field_0x1fd8[j]);
dComIfGs_setBeastNum(beastIdx, 0);
for (int itemBtn = 0; itemBtn < dItemBtn_COUNT_e; itemBtn++) {
if (dComIfGp_getSelectItem(itemBtn) == fopMsgM_itemNumIdx(beastIdx + dInvSlot_BeastFirst_e)) {
dMeter_PaneHide(&i_Meter->field_0x2080[itemBtn]);
dMeter_PaneHide(&i_Meter->field_0x2128[itemBtn]);
dMeter_PaneHide(&i_Meter->field_0x1f30[itemBtn]);
dMeter_PaneHide(&i_Meter->field_0x1fd8[itemBtn]);
}
}
uVar8 = fopMsgM_itemNumIdx(i + 0x18);
dComIfGs_setBeastItemEmpty(uVar8);
int itemNo = fopMsgM_itemNumIdx(beastIdx + dInvSlot_BeastFirst_e);
dComIfGs_setBeastItemEmpty(itemNo);
bVar3 = true;
} else {
if (sVar4 > 99) {
sVar4 = 99;
}
dComIfGs_setBeastNum(i, sVar4);
dComIfGs_setBeastNum(beastIdx, sVar4);
bVar3 = true;
}
}
if (dMenu_baitNum[i] != dComIfGs_getBaitNum(i)) {
dMenu_baitNum[i] = dComIfGs_getBaitNum(i);
if (dMenu_baitNum[beastIdx] != dComIfGs_getBaitNum(beastIdx)) {
dMenu_baitNum[beastIdx] = dComIfGs_getBaitNum(beastIdx);
bVar3 = true;
}
}
#if VERSION > VERSION_DEMO
for (s32 i = 0; i < 3; i++) {
if (dComIfGp_getSelectItem(i) == dItem_BIRD_BAIT_5_e) {
for (int itemBtn = 0; itemBtn < dItemBtn_COUNT_e; itemBtn++) {
if (dComIfGp_getSelectItem(itemBtn) == dItem_BIRD_BAIT_5_e) {
bVar3 = true;
}
}
#endif
if (bVar3) {
for (s32 i = 0; i < 3; i++) {
dMeter_xyItemNumberSet(i_Meter, i);
for (int itemBtn = 0; itemBtn < dItemBtn_COUNT_e; itemBtn++) {
dMeter_xyItemNumberSet(i_Meter, itemBtn);
}
}
}
/* 801F5C98-801F5FDC .text dMeter_xyItemChange__FP15sub_meter_classi */
void dMeter_xyItemChange(sub_meter_class* i_Meter, int param_2) {
void dMeter_xyItemChange(sub_meter_class* i_Meter, int i_itemBtn) {
JKRArchive* pArc;
const char* pFilename;
if (dComIfGp_getSelectItem(param_2) != dItem_NONE_e) {
if (dComIfGs_getSelectItem(param_2) >= dInvSlot_ReserveFirst_e) {
dMeter_PaneShow(&i_Meter->field_0x2080[param_2]);
dMeter_PaneShow(&i_Meter->field_0x2128[param_2]);
if (dComIfGp_getSelectItem(i_itemBtn) != dItem_NONE_e) {
if (dComIfGs_getSelectItem(i_itemBtn) >= dInvSlot_ReserveFirst_e) {
dMeter_PaneShow(&i_Meter->field_0x2080[i_itemBtn]);
dMeter_PaneShow(&i_Meter->field_0x2128[i_itemBtn]);
pArc = dComIfGp_getItemIconArchive();
pFilename = dItem_data::getTexture(dComIfGp_getSelectItem(param_2));
JKRArchive::readTypeResource(i_Meter->xyIconTex[param_2], 0xc00, 'TIMG', pFilename, pArc);
DCStoreRangeNoSync(i_Meter->xyIconTex[param_2], 0xc00);
((J2DPicture*)i_Meter->field_0x2080[param_2].pane)->changeTexture(i_Meter->xyIconTex[param_2], 0);
((J2DPicture*)i_Meter->field_0x2128[param_2].pane)->changeTexture(i_Meter->xyIconTex[param_2], 0);
} else if (dComIfGs_getSelectItem(param_2) >= dInvSlot_BaitFirst_e) {
dMeter_PaneShow(&i_Meter->field_0x2080[param_2]);
dMeter_PaneShow(&i_Meter->field_0x2128[param_2]);
pFilename = dItem_data::getTexture(dComIfGp_getSelectItem(i_itemBtn));
JKRArchive::readTypeResource(i_Meter->xyIconTex[i_itemBtn], 0xc00, 'TIMG', pFilename, pArc);
DCStoreRangeNoSync(i_Meter->xyIconTex[i_itemBtn], 0xc00);
((J2DPicture*)i_Meter->field_0x2080[i_itemBtn].pane)->changeTexture(i_Meter->xyIconTex[i_itemBtn], 0);
((J2DPicture*)i_Meter->field_0x2128[i_itemBtn].pane)->changeTexture(i_Meter->xyIconTex[i_itemBtn], 0);
} else if (dComIfGs_getSelectItem(i_itemBtn) >= dInvSlot_BaitFirst_e) {
dMeter_PaneShow(&i_Meter->field_0x2080[i_itemBtn]);
dMeter_PaneShow(&i_Meter->field_0x2128[i_itemBtn]);
pArc = dComIfGp_getItemIconArchive();
pFilename = dItem_data::getTexture(dComIfGp_getSelectItem(param_2));
JKRArchive::readTypeResource(i_Meter->xyIconTex[param_2], 0xc00, 'TIMG', pFilename, pArc);
DCStoreRangeNoSync(i_Meter->xyIconTex[param_2], 0xc00);
((J2DPicture*)i_Meter->field_0x2080[param_2].pane)->changeTexture(i_Meter->xyIconTex[param_2], 0);
((J2DPicture*)i_Meter->field_0x2128[param_2].pane)->changeTexture(i_Meter->xyIconTex[param_2], 0);
} else if (dComIfGs_getSelectItem(param_2) >= dInvSlot_BeastFirst_e) {
dMeter_PaneShow(&i_Meter->field_0x2080[param_2]);
dMeter_PaneShow(&i_Meter->field_0x2128[param_2]);
pFilename = dItem_data::getTexture(dComIfGp_getSelectItem(i_itemBtn));
JKRArchive::readTypeResource(i_Meter->xyIconTex[i_itemBtn], 0xc00, 'TIMG', pFilename, pArc);
DCStoreRangeNoSync(i_Meter->xyIconTex[i_itemBtn], 0xc00);
((J2DPicture*)i_Meter->field_0x2080[i_itemBtn].pane)->changeTexture(i_Meter->xyIconTex[i_itemBtn], 0);
((J2DPicture*)i_Meter->field_0x2128[i_itemBtn].pane)->changeTexture(i_Meter->xyIconTex[i_itemBtn], 0);
} else if (dComIfGs_getSelectItem(i_itemBtn) >= dInvSlot_BeastFirst_e) {
dMeter_PaneShow(&i_Meter->field_0x2080[i_itemBtn]);
dMeter_PaneShow(&i_Meter->field_0x2128[i_itemBtn]);
pArc = dComIfGp_getItemIconArchive();
pFilename = dItem_data::getTexture(dComIfGp_getSelectItem(param_2));
JKRArchive::readTypeResource(i_Meter->xyIconTex[param_2], 0xc00, 'TIMG', pFilename, pArc);
DCStoreRangeNoSync(i_Meter->xyIconTex[param_2], 0xc00);
((J2DPicture*)i_Meter->field_0x2080[param_2].pane)->changeTexture(i_Meter->xyIconTex[param_2], 0);
((J2DPicture*)i_Meter->field_0x2128[param_2].pane)->changeTexture(i_Meter->xyIconTex[param_2], 0);
pFilename = dItem_data::getTexture(dComIfGp_getSelectItem(i_itemBtn));
JKRArchive::readTypeResource(i_Meter->xyIconTex[i_itemBtn], 0xc00, 'TIMG', pFilename, pArc);
DCStoreRangeNoSync(i_Meter->xyIconTex[i_itemBtn], 0xc00);
((J2DPicture*)i_Meter->field_0x2080[i_itemBtn].pane)->changeTexture(i_Meter->xyIconTex[i_itemBtn], 0);
((J2DPicture*)i_Meter->field_0x2128[i_itemBtn].pane)->changeTexture(i_Meter->xyIconTex[i_itemBtn], 0);
} else {
dMeter_PaneShow(&i_Meter->field_0x2080[param_2]);
dMeter_PaneShow(&i_Meter->field_0x2128[param_2]);
u8 uVar2 = dComIfGp_getSelectItem(param_2);
dMeter_PaneShow(&i_Meter->field_0x2080[i_itemBtn]);
dMeter_PaneShow(&i_Meter->field_0x2128[i_itemBtn]);
u8 uVar2 = dComIfGp_getSelectItem(i_itemBtn);
u8 var_r4 = uVar2;
if (uVar2 == dItem_MAGIC_ARROW_e) {
i_Meter->field_0x2320[param_2].pane->show();
i_Meter->field_0x23c8[param_2].pane->show();
i_Meter->field_0x2470[param_2].pane->hide();
i_Meter->field_0x2320[i_itemBtn].pane->show();
i_Meter->field_0x23c8[i_itemBtn].pane->show();
i_Meter->field_0x2470[i_itemBtn].pane->hide();
var_r4 = dItem_BOW_e;
} else if (uVar2 == dItem_LIGHT_ARROW_e) {
i_Meter->field_0x2320[param_2].pane->show();
i_Meter->field_0x23c8[param_2].pane->show();
i_Meter->field_0x2470[param_2].pane->show();
i_Meter->field_0x2320[i_itemBtn].pane->show();
i_Meter->field_0x23c8[i_itemBtn].pane->show();
i_Meter->field_0x2470[i_itemBtn].pane->show();
var_r4 = dItem_BOW_e;
}
if ((var_r4 == dItem_MAGIC_ARROW_e) || (var_r4 == dItem_LIGHT_ARROW_e)) {
@@ -2912,16 +2888,16 @@ void dMeter_xyItemChange(sub_meter_class* i_Meter, int param_2) {
}
pArc = dComIfGp_getItemIconArchive();
pFilename = dItem_data::getTexture(var_r4);
JKRArchive::readTypeResource(i_Meter->xyIconTex[param_2], 0xc00, 'TIMG', pFilename, pArc);
DCStoreRangeNoSync(i_Meter->xyIconTex[param_2], 0xc00);
((J2DPicture*)i_Meter->field_0x2080[param_2].pane)->changeTexture(i_Meter->xyIconTex[param_2], 0);
((J2DPicture*)i_Meter->field_0x2128[param_2].pane)->changeTexture(i_Meter->xyIconTex[param_2], 0);
JKRArchive::readTypeResource(i_Meter->xyIconTex[i_itemBtn], 0xc00, 'TIMG', pFilename, pArc);
DCStoreRangeNoSync(i_Meter->xyIconTex[i_itemBtn], 0xc00);
((J2DPicture*)i_Meter->field_0x2080[i_itemBtn].pane)->changeTexture(i_Meter->xyIconTex[i_itemBtn], 0);
((J2DPicture*)i_Meter->field_0x2128[i_itemBtn].pane)->changeTexture(i_Meter->xyIconTex[i_itemBtn], 0);
}
} else {
dMeter_PaneHide(&i_Meter->field_0x2080[param_2]);
dMeter_PaneHide(&i_Meter->field_0x2128[param_2]);
dMeter_PaneHide(&i_Meter->field_0x2080[i_itemBtn]);
dMeter_PaneHide(&i_Meter->field_0x2128[i_itemBtn]);
}
dMeter_xyItemNumberSet(i_Meter, param_2);
dMeter_xyItemNumberSet(i_Meter, i_itemBtn);
}
/* 801F5FDC-801F6084 .text dMeter_xyRotateZ__FP18fopMsgM_pane_classff */
@@ -2990,13 +2966,13 @@ void dMeter_xyAlpha(sub_meter_class* i_Meter) {
}
}
} else {
for (s32 i = 0; i < 3; i++) {
if (((i_Meter->mStatusFlags & dMtrStts_UNK1000_e) && (dComIfGp_getSelectItem(i) != dItem_GRAPPLING_HOOK_e)) ||
((i_Meter->mStatusFlags & dMtrStts_UNK80_e) && (dComIfGp_getSelectItem(i) != dItem_TELESCOPE_e)) ||
for (int itemBtn = 0; itemBtn < dItemBtn_COUNT_e; itemBtn++) {
if (((i_Meter->mStatusFlags & dMtrStts_UNK1000_e) && (dComIfGp_getSelectItem(itemBtn) != dItem_GRAPPLING_HOOK_e)) ||
((i_Meter->mStatusFlags & dMtrStts_UNK80_e) && (dComIfGp_getSelectItem(itemBtn) != dItem_TELESCOPE_e)) ||
((i_Meter->mStatusFlags & dMtrStts_UNK20000_e) &&
((dVar2 = dComIfGp_getSelectItem(i), ((dVar2 == CAMERA) == 0)) || (dVar2 != CAMERA2))) ||
((dVar2 = dComIfGp_getSelectItem(itemBtn), ((dVar2 == CAMERA) == 0)) || (dVar2 != CAMERA2))) ||
((i_Meter->mStatusFlags & dMtrStts_UNK400_e) && (dComIfGp_getMiniGameType() != 1) &&
(dVar2 = dComIfGp_getSelectItem(i), ((dVar2 == NORMAL_SAIL) == 0)) && (dVar2 != dItem_TELESCOPE_e) &&
(dVar2 = dComIfGp_getSelectItem(itemBtn), ((dVar2 == NORMAL_SAIL) == 0)) && (dVar2 != dItem_TELESCOPE_e) &&
(dVar2 != dItem_WIND_WAKER_e) && (dVar2 != dItem_GRAPPLING_HOOK_e) && (dVar2 != dItem_BOOMERANG_e) &&
(dVar2 != dItem_TINGLE_TUNER_e) && (dVar2 != CAMERA) && (dVar2 != CAMERA2) && (dVar2 != dItem_MAGIC_ARMOR_e) &&
(dVar2 != dItem_BAIT_BAG_e) && (dVar2 != dItem_HYOI_PEAR_e) && (dVar2 != dItem_BIRD_BAIT_5_e) && (dVar2 != dItem_BOW_e) &&
@@ -3005,19 +2981,19 @@ void dMeter_xyAlpha(sub_meter_class* i_Meter) {
(dVar2 != dItem_BLUE_POTION_e) && (dVar2 != dItem_HALF_SOUP_BOTTLE_e) && (dVar2 != dItem_SOUP_BOTTLE_e) &&
(dVar2 != dItem_WATER_BOTTLE_e) && (dVar2 != dItem_FAIRY_BOTTLE_e) && (dVar2 != dItem_FIREFLY_BOTTLE_e) &&
(dVar2 != dItem_FOREST_WATER_e)) ||
((dComIfGp_getMiniGameType() == 1) && (dVar2 = dComIfGp_getSelectItem(i), ((dVar2 == NORMAL_SAIL) == 0)) &&
((dComIfGp_getMiniGameType() == 1) && (dVar2 = dComIfGp_getSelectItem(itemBtn), ((dVar2 == NORMAL_SAIL) == 0)) &&
(dVar2 != dItem_TELESCOPE_e)) ||
((dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()) == dStageType_BOSS_e) &&
((strcmp(dComIfGp_getStartStageName(), "Xboss0") == 0) || (strcmp(dComIfGp_getStartStageName(), "Xboss1") == 0) ||
(strcmp(dComIfGp_getStartStageName(), "Xboss2") == 0) || (strcmp(dComIfGp_getStartStageName(), "Xboss3") == 0)) &&
((dVar2 = dComIfGp_getSelectItem(i), (dVar2 == dItem_WATER_BOTTLE_e)) || ((u8)dVar2 == dItem_FIREFLY_BOTTLE_e) ||
((dVar2 = dComIfGp_getSelectItem(itemBtn), (dVar2 == dItem_WATER_BOTTLE_e)) || ((u8)dVar2 == dItem_FIREFLY_BOTTLE_e) ||
(dVar2 == dItem_FOREST_WATER_e))) ||
((i_Meter->mStatusFlags & dMtrStts_UNK2_e) && (dVar2 = dComIfGp_getSelectItem(i), (dVar2 == dItem_TINGLE_TUNER_e) == 0) &&
((i_Meter->mStatusFlags & dMtrStts_UNK2_e) && (dVar2 = dComIfGp_getSelectItem(itemBtn), (dVar2 == dItem_TINGLE_TUNER_e) == 0) &&
((dVar2 != dItem_WIND_WAKER_e) || (strcmp(dComIfGp_getStartStageName(), "Otkura") != 0)) &&
((dComIfGp_getSelectItem(i) != dItem_GRAPPLING_HOOK_e) || (strcmp(dComIfGp_getStartStageName(), "Abesso") != 0)) &&
(dVar2 = dComIfGp_getSelectItem(i), ((dVar2 == CAMERA) == 0)) && (dVar2 != CAMERA2) && (dVar2 != dItem_SPOILS_BAG_e) &&
((dComIfGp_getSelectItem(itemBtn) != dItem_GRAPPLING_HOOK_e) || (strcmp(dComIfGp_getStartStageName(), "Abesso") != 0)) &&
(dVar2 = dComIfGp_getSelectItem(itemBtn), ((dVar2 == CAMERA) == 0)) && (dVar2 != CAMERA2) && (dVar2 != dItem_SPOILS_BAG_e) &&
(dVar2 != dItem_SKULL_NECKLACE_e) && (dVar2 != dItem_BOKOBABA_SEED_e) && (dVar2 != dItem_GOLDEN_FEATHER_e) &&
(dVar2 != BOKO_BELT) && (dVar2 != dItem_RED_JELLY_e) && (dVar2 != dItem_GREEN_JELLY_e) && (dVar2 != dItem_BLUE_JELLY_e) &&
(dVar2 != dItem_KNIGHTS_CREST_e) && (dVar2 != dItem_RED_JELLY_e) && (dVar2 != dItem_GREEN_JELLY_e) && (dVar2 != dItem_BLUE_JELLY_e) &&
(dVar2 != dItem_JOY_PENDANT_e) && (dVar2 != dItem_BAIT_BAG_e) && (dVar2 != dItem_BIRD_BAIT_5_e) && (dVar2 != dItem_HYOI_PEAR_e) &&
(dVar2 != dItem_EMPTY_BOTTLE_e) && (dVar2 != dItem_RED_POTION_e) && (dVar2 != dItem_GREEN_POTION_e) &&
(dVar2 != dItem_BLUE_POTION_e) && (dVar2 != dItem_HALF_SOUP_BOTTLE_e) && (dVar2 != dItem_SOUP_BOTTLE_e) &&
@@ -3028,22 +3004,20 @@ void dMeter_xyAlpha(sub_meter_class* i_Meter) {
(dVar2 != PRESIDENT_STATUE) && (dVar2 != dItem_FATHER_LETTER_e) && (dVar2 != dItem_NOTE_TO_MOM_e) && (dVar2 != MAGYS_LETTER) &&
(dVar2 != MO_LETTER) && (dVar2 != COTTAGE_PAPER) && (dVar2 != KAISEN_PRESENT1) && (dVar2 != KAISEN_PRESENT2)))
{
if (alphaNowFrame[i] > 3) {
alphaNowFrame[i]--;
if (alphaNowFrame[itemBtn] > 3) {
alphaNowFrame[itemBtn]--;
} else if (alphaNowFrame[itemBtn] < 3) {
alphaNowFrame[itemBtn]++;
} else {
if (alphaNowFrame[i] < 3) {
alphaNowFrame[i]++;
} else {
alphaNowFrame[i] = 3;
}
alphaNowFrame[itemBtn] = 3;
}
} else {
if (alphaNowFrame[i] < 5) {
alphaNowFrame[i]++;
if (alphaNowFrame[itemBtn] < 5) {
alphaNowFrame[itemBtn]++;
} else {
alphaNowFrame[i] = 5;
alphaNowFrame[itemBtn] = 5;
}
switch (i) {
switch (itemBtn) {
case 0:
i_Meter->field_0x3024 |= 4;
break;
src/f_op/f_op_msg_mng.cpp
+3 -3
View File
@@ -86,7 +86,7 @@ static struct {
/* 0x18 */ {dItem_SKULL_NECKLACE_e, "beast_01.bti"},
/* 0x19 */ {dItem_BOKOBABA_SEED_e, "beast_02.bti"},
/* 0x1A */ {dItem_GOLDEN_FEATHER_e, "beast_03.bti"},
/* 0x1B */ {BOKO_BELT, "beast_04.bti"},
/* 0x1B */ {dItem_KNIGHTS_CREST_e, "beast_04.bti"},
/* 0x1C */ {dItem_RED_JELLY_e, "beast_05.bti"},
/* 0x1D */ {dItem_GREEN_JELLY_e, "beast_06.bti"},
/* 0x1E */ {dItem_BLUE_JELLY_e, "beast_07.bti"},
@@ -3316,7 +3316,7 @@ void fopMsgM_msgDataProc_c::tag_len_point(int* param_1, f32* param_2, int* param
void fopMsgM_msgDataProc_c::tag_len_get_pendant(int* param_1, f32* param_2, int* param_3, int* param_4, int* param_5) {
char buf[28];
int num = (u8)dComIfGs_getBeastNum(7);
int num = (u8)dComIfGs_getBeastNum(dBeastIdx_JOY_PENDANT_e);
fopMsgM_int_to_char(buf, num, false);
#if VERSION == VERSION_PAL
@@ -5118,7 +5118,7 @@ void fopMsgM_msgDataProc_c::tag_point() {
void fopMsgM_msgDataProc_c::tag_get_pendant() {
char buf[20];
int num = (u8)dComIfGs_getBeastNum(7);
int num = (u8)dComIfGs_getBeastNum(dBeastIdx_JOY_PENDANT_e);
fopMsgM_int_to_char(buf, num, false);
int i = 0;