diff --git a/include/d/actor/d_a_alink.h b/include/d/actor/d_a_alink.h index 90c6e75e45..80e2a93183 100644 --- a/include/d/actor/d_a_alink.h +++ b/include/d/actor/d_a_alink.h @@ -1321,7 +1321,7 @@ public: /* 800D0CDC */ virtual ~hsChainShape_c(); }; // Size: 0x10 - /* 8009D87C */ bool getE3Zhint(); + /* 8009D87C */ static BOOL getE3Zhint(); /* 8009D884 */ static const char* getAlinkArcName(); /* 8009DA60 */ static bool checkStageName(char const*); /* 8009DA98 */ void tgHitCallback(fopAc_ac_c*, dCcD_GObjInf*, dCcD_GObjInf*); @@ -3215,10 +3215,10 @@ public: return checkHookshotReadyAnime() || checkHookshotShootAnime(); } BOOL checkBoomerangReadyAnime() const { - return (mEquipItem == BOOMERANG || mEquipItem == noentry71) && checkUpperAnime(0x54); + return (mEquipItem == fpcNm_ITEM_BOOMERANG || mEquipItem == 0x102) && checkUpperAnime(0x54); } bool checkDkCaught2Anime() const { return checkUpperAnime(0x262); } - BOOL checkCopyRodThrowAnime() const { return mEquipItem == COPY_ROD && checkUpperAnime(0x53); } + BOOL checkCopyRodThrowAnime() const { return mEquipItem == fpcNm_ITEM_COPY_ROD && checkUpperAnime(0x53); } BOOL checkCutDashChargeAnime() const { return checkUpperAnime(0x83); } BOOL checkBoomerangAnimeAndReturnWait() const { return checkBoomerangAnime(); } BOOL checkTwoHandItemEquipAnime() const { return checkUpperAnime(0x245); } @@ -3249,7 +3249,7 @@ public: bool checkIronBallSwingAnime() const { return checkUpperAnime(0x19B); } bool checkDashDamageAnime() const { return checkUpperAnime(0xAD); } bool checkBoomerangCatchAnime() const { return checkUpperAnime(0x52); } - BOOL checkCopyRodReadyAnime() const { return mEquipItem == COPY_ROD && checkUpperAnime(0x54); } + BOOL checkCopyRodReadyAnime() const { return mEquipItem == fpcNm_ITEM_COPY_ROD && checkUpperAnime(0x54); } BOOL checkCanoeFishingWaitAnime() const { return checkUpperAnime(0x5D) || checkUpperAnime(0x260); } BOOL checkCopyRodControllAnime() const { return checkUpperAnime(0x202); } BOOL checkWolfHeadDamageAnime() const { return checkUpperAnime(0x2A7); } @@ -3262,7 +3262,7 @@ public: bool swordButton() { return itemButtonCheck(8); } daPy_actorKeep_c* getThrowBoomerangAcKeep() { return &mThrowBoomerangAcKeep; } s32 getStartRoomNo() { return fopAcM_GetParam(this) & 0x3F; } - bool checkFisingRodLure() const { return mEquipItem == noentry73; } + bool checkFisingRodLure() const { return mEquipItem == 0x105; } BOOL doTrigger() const { return mItemTrigger & BTN_A; } bool swordTrigger() { return itemTriggerCheck(BTN_B); } BOOL grassCancelTrigger() { return itemTriggerCheck(BTN_B); } @@ -3439,7 +3439,7 @@ public: void setGrassCancelStatus(u8 param_0) { setBStatus(param_0); } void seStartSystem(u32 i_seID) { mDoAud_seStart(i_seID, NULL, 0, 0); } - bool checkIronBallEquip() const { return mEquipItem == IRONBALL; } + bool checkIronBallEquip() const { return mEquipItem == fpcNm_ITEM_IRONBALL; } f32 getAnmSpeedStickRate(f32 param_0, f32 param_1) const { return param_0 + (field_0x33a8 * (param_1 - param_0)); diff --git a/include/d/actor/d_a_midna.h b/include/d/actor/d_a_midna.h index cc67587b7f..c1077de6f8 100644 --- a/include/d/actor/d_a_midna.h +++ b/include/d/actor/d_a_midna.h @@ -363,7 +363,7 @@ public: void resetRatBody() {} - bool checkFlyWaitAnime() { + bool checkFlyWaitAnime() const { return mBckHeap[0].getIdx() == 0x1CB || mBckHeap[0].getIdx() == 0x1C7 || mBckHeap[0].getIdx() == 0x1C8 || mBckHeap[0].getIdx() == 0x1C9; } diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h index 8f95de926d..cc948dc7a8 100644 --- a/include/d/actor/d_a_player.h +++ b/include/d/actor/d_a_player.h @@ -140,7 +140,103 @@ class daBoomerang_c; class daPy_demo_c { public: enum { - DEMO_LAST_e = 0x5F, + DEMO_UNK_0_e, + DEMO_UNK_1_e, + DEMO_UNK_2_e, + DEMO_UNK_3_e, + DEMO_UNK_4_e, + DEMO_WAIT_TURN_e, + DEMO_UNK_6_e, + DEMO_UNK_7_e, + DEMO_UNK_8_e, + DEMO_UNK_9_e, + DEMO_OPEN_TREASURE_e, + DEMO_GET_ITEM_e, + DEMO_UNEQUIP_e, + DEMO_GRAB_PUT_e, + DEMO_UNK_14_e, + DEMO_UNK_15_e, + DEMO_UNK_16_e, + DEMO_UNK_17_e, + DEMO_UNK_18_e, + DEMO_MONKEY_MOVE_e, + DEMO_LOOK_AROUND_e, + DEMO_UNK_21_e, + DEMO_UNK_22_e, + DEMO_UNK_23_e, + DEMO_UNK_24_e, + DEMO_TURN_BACK_e, + DEMO_UNK_26_e, + DEMO_UNK_27_e, + DEMO_BOOMERANG_CATCH_e, + DEMO_HAWK_CATCH_e, + DEMO_SWORD_UNEQUIP_SP_e, + DEMO_UNK_31_e, + DEMO_PUSH_PULL_WAIT_e, + DEMO_PUSH_MOVE_e, + DEMO_BOSS_ATN_WAIT_e, + DEMO_DOOR_OPEN_e, + DEMO_UNK_36_e, + DEMO_TRADE_ITEM_OUT_e, + DEMO_UNK_38_e, + DEMO_KANDELAAR_SWING_e, + DEMO_FRONT_ROLL_e, + DEMO_CROUCH_e, + DEMO_UNK_42_e, + DEMO_UNK_43_e, + DEMO_UNK_44_e, + DEMO_UNK_45_e, + DEMO_CAUGHT_e, + DEMO_LOOK_UP_e, + DEMO_LOOK_UP_TO_GET_ITEM_e, + DEMO_HAND_PAT_e, + DEMO_WOLF_MIDNA_RIDE_SHOCK_e, + DEMO_SUMOU_SHIKO_e, + DEMO_FOG_DEAD_e, + DEMO_WOLF_SMELL_WAIT_e, + DEMO_UNK_54_e, + DEMO_UNK_55_e, + DEMO_WOLF_CARGO_CARRY_e, + DEMO_METAMORPHOSE_UNK1_e, + DEMO_METAMORPHOSE_UNK2_e, + DEMO_HORSE_GET_KEY_e, + DEMO_NOD_e, + DEMO_GLARE_e, + DEMO_EYE_AWAY_e, + DEMO_GOAT_STOP_READY_e, + DEMO_GET_READY_SIT_e, + DEMO_UNK_65_e, + DEMO_TWGATE_e, + DEMO_FM_CHAIN_STRONG_PULL_e, + DEMO_WOLF_SNOW_ESCAPE_e, + DEMO_ZORA_MOVE_e, + DEMO_METAMORPHOSE_ONLY_UNK1_e, + DEMO_METAMORPHOSE_ONLY_UNK2_e, + DEMO_LOOK_AROUND_TURN_e, + DEMO_UNK_73_e, + DEMO_QUAKE_INIT_e, + DEMO_GUARD_ATTACK_e, + DEMO_SWORD_READY_e, + DEMO_DUNGEON_WARP_e, + DEMO_DUNGEON_WARP_SCENE_START_e, + DEMO_MASTER_SWORD_STICK_e, + DEMO_MASTER_SWORD_PULL_e, + DEMO_CUT_DOWN_e, + DEMO_UNK_82_e, + DEMO_CUT_HEAD_e, + DEMO_UNK_84_e, + DEMO_UNK_85_e, + DEMO_CUT_LARGE_JUMP_e, + DEMO_CUT_FAST_READY_e, + DEMO_COPY_ROD_REVIVE_e, + DEMO_SWORD_PUSH_e, + DEMO_GANON_FINISH_e, + DEMO_UNK_91_e, + DEMO_UNK_92_e, + DEMO_HORSE_LOOK_DOWN_e, + DEMO_UNK_94_e, + DEMO_LAST_e, + DEMO_NEW_ANM0_e = 0x200, }; diff --git a/include/d/actor/d_a_tag_lantern.h b/include/d/actor/d_a_tag_lantern.h index faf04d85f9..87127fb43c 100644 --- a/include/d/actor/d_a_tag_lantern.h +++ b/include/d/actor/d_a_tag_lantern.h @@ -17,7 +17,7 @@ public: BOOL rt = false; if (fopAcM_searchPlayerDistanceXZ(this) < scale.x && 0.0f <= var_f31 && var_f31 < scale.y) { - rt = dComIfGp_checkItemGet(KANTERA, 1) && dComIfGs_getOil() != 0; + rt = dComIfGp_checkItemGet(fpcNm_ITEM_KANTERA, 1) && dComIfGs_getOil() != 0; field_0x5f8 = rt == true ? 0 : 1; } else { rt = true; diff --git a/include/d/actor/d_a_tbox.h b/include/d/actor/d_a_tbox.h index 5dc4763ddf..2987743ece 100644 --- a/include/d/actor/d_a_tbox.h +++ b/include/d/actor/d_a_tbox.h @@ -143,7 +143,7 @@ public: void action() { (this->*mpActionFn)(); } private: - /* 0x718 */ bool field_0x718; + /* 0x718 */ u8 field_0x718; /* 0x71C */ request_of_phase_process_class mPhase; /* 0x724 */ J3DModel* mpModel; /* 0x728 */ J3DModel* mpSlimeModel; @@ -151,7 +151,7 @@ private: /* 0x730 */ J3DModel* mpEffectModel; /* 0x734 */ mDoExt_brkAnm* mpEffectAnm; /* 0x738 */ dBgW* mpOpenBgW; - /* 0x73C */ dBgW* mpBgCollider; + /* 0x73C */ dBgW* mpBgCollision; /* 0x740 */ daTbox_actionFn mpActionFn; /* 0x74C */ int mStaffId; /* 0x750 */ f32 field_0x750; diff --git a/include/d/d_bg_pc.h b/include/d/d_bg_pc.h index f2fd07d1e0..9a27765da5 100644 --- a/include/d/d_bg_pc.h +++ b/include/d/d_bg_pc.h @@ -11,63 +11,52 @@ struct sBgPc { /* 0x10 */ u32 code4; }; // Size: 0x14 -enum dBgPc_ECode { - /* 0x00004000 */ CODE_OBJ_THRU = 0x4000, - /* 0x00008000 */ CODE_CAM_THRU = 0x8000, - /* 0x00010000 */ CODE_LINK_THRU = 0x10000, - /* 0x00020000 */ CODE_ARROW_THRU = 0x20000, - /* 0x00040000 */ CODE_HS_STICK = 0x40000, - /* 0x00080000 */ CODE_BOOMERANG_THRU = 0x80000, - /* 0x00100000 */ CODE_ROPE_THRU = 0x100000, - /* 0x00200000 */ CODE_HORSE_NO_ENTRY = 0x200000, - /* 0x00400000 */ CODE_SHDW_THRU = 0x400000, - /* 0x00800000 */ CODE_BOMB_THRU = 0x800000, - /* 0x01000000 */ CODE_IRON_BALL_THRU = 0x1000000, - /* 0x02000000 */ CODE_ATTACK_THRU = 0x2000000, - /* 0x40000000 */ CODE_UNDERWATER_ROOF = 0x40000000, -}; +#define BGPC_GET_BITS(code, shift, bits) \ + ((code >> shift) & ((1 << bits) - 1)) + +#define BGPC_CHECK_BIT(code, bit) \ + (code & (1 << bit)) class dBgPc { public: void setCode(sBgPc&); + + u8 getExit() const { return BGPC_GET_BITS(m_code.code0, 0, 6); } + u8 getPolyCol() const { return BGPC_GET_BITS(m_code.code0, 6, 8); } + u32 getObjThrough() const { return BGPC_CHECK_BIT(m_code.code0, 14); } + u32 getCamThrough() const { return BGPC_CHECK_BIT(m_code.code0, 15); } + u32 getLinkThrough() const { return BGPC_CHECK_BIT(m_code.code0, 16); } + u32 getArrowThrough() const { return BGPC_CHECK_BIT(m_code.code0, 17); } + u32 getHSStick() const { return BGPC_CHECK_BIT(m_code.code0, 18); } + u32 getBoomerangThrough() const { return BGPC_CHECK_BIT(m_code.code0, 19); } + u32 getRopeThrough() const { return BGPC_CHECK_BIT(m_code.code0, 20); } + u32 getHorseNoEntry() const { return BGPC_CHECK_BIT(m_code.code0, 21) != 0; } + u32 getShdwThrough() const { return BGPC_CHECK_BIT(m_code.code0, 22); } + u32 getBombThrough() const { return BGPC_CHECK_BIT(m_code.code0, 23); } + s32 getSpl() const { return BGPC_GET_BITS(m_code.code0, 24, 4); } + u32 getMagnet() const { return BGPC_GET_BITS(m_code.code0, 28, 2); } + u32 getUnderwaterRoof() const { return BGPC_CHECK_BIT(m_code.code0, 30); } + u32 getMonkeyBars() const { return BGPC_CHECK_BIT(m_code.code0, 31) != 0; } - u32 getHorseNoEntry() const { return m_code.code0 >> 0x15 & 1; } - s32 getSpl() const { return m_code.code0 >> 0x18 & 0xF; } - u32 getMagnet() const { return m_code.code0 >> 0x1C & 0x3; } - u32 getMonkeyBars() const { return m_code.code0 >> 0x1F; } - s32 getWallCode() const { return m_code.code1 >> 0x8 & 0xF; } - u32 getAtt0Code() const { return m_code.code1 >> 0xC & 0xF; } - u32 getAtt1Code() const { return m_code.code1 >> 0x10 & 0x7; } - u32 getGroundCode() const { return m_code.code1 >> 0x13 & 0x1F; } - u32 getObjThrough() const { return m_code.code0 & CODE_OBJ_THRU; } - u32 getCamThrough() const { return m_code.code0 & CODE_CAM_THRU; } - u32 getLinkThrough() const { return m_code.code0 & CODE_LINK_THRU; } - u32 getArrowThrough() const { return m_code.code0 & CODE_ARROW_THRU; } - u32 getHSStick() const { return m_code.code0 & CODE_HS_STICK; } - u32 getBoomerangThrough() const { return m_code.code0 & CODE_BOOMERANG_THRU; } - u32 getRopeThrough() const { return m_code.code0 & CODE_ROPE_THRU; } - u32 getBombThrough() const { return m_code.code0 & CODE_BOMB_THRU; } - u32 getIronBallThrough() const { return m_code.code1 & CODE_IRON_BALL_THRU; } - u32 getShdwThrough() const { return m_code.code0 & CODE_SHDW_THRU; } - u32 getUnderwaterRoof() const { return m_code.code0 & CODE_UNDERWATER_ROOF; } - u32 getAttackThrough() const { return m_code.code1 & CODE_ATTACK_THRU; } - u8 getRoom() const { return m_code.code4 >> 0x14; } - u8 getExit() const { return m_code.code0 & 0x3F; } - u8 getPolyCol() const { return m_code.code0 >> 6; } - u8 getLinkNo() const { return m_code.code1; } - u8 getCamMoveBG() const { return m_code.code2; } - u8 getRoomCam() const { return m_code.code2 >> 8; } - u8 getRoomPath() const { return m_code.code2 >> 0x10; } - u8 getRoomPathPnt() const { return m_code.code2 >> 0x18; } - u8 getRoomInf() const { return m_code.code4; } - u8 getSnd() const { return m_code.code4 >> 0xB; } - u32 maskNrm() { return m_code.code4 & 0x100; } + u8 getLinkNo() const { return BGPC_GET_BITS(m_code.code1, 0, 8); } + s32 getWallCode() const { return BGPC_GET_BITS(m_code.code1, 8, 4); } + u32 getAtt0Code() const { return BGPC_GET_BITS(m_code.code1, 12, 4); } + u32 getAtt1Code() const { return BGPC_GET_BITS(m_code.code1, 16, 3); } + u32 getGroundCode() const { return BGPC_GET_BITS(m_code.code1, 19, 5); } + u32 getIronBallThrough() const { return BGPC_CHECK_BIT(m_code.code1, 24); } + u32 getAttackThrough() const { return BGPC_CHECK_BIT(m_code.code1, 25); } + u8 getCamMoveBG() const { return BGPC_GET_BITS(m_code.code2, 0, 8); } + u8 getRoomCam() const { return BGPC_GET_BITS(m_code.code2, 8, 8); } + u8 getRoomPath() const { return BGPC_GET_BITS(m_code.code2, 16, 8); } + u8 getRoomPathPnt() const { return BGPC_GET_BITS(m_code.code2, 24, 8); } + + u8 getRoomInf() const { return BGPC_GET_BITS(m_code.code4, 0, 8); } + u32 maskNrm() { return BGPC_CHECK_BIT(m_code.code4, 8); } // BUG: Seems like this uses the same mask as maskNrm - u32 getWtr() { return m_code.code4 & 0x100; } - u32 getObjThrough() { return m_code.code0 & 0x4000; } - u32 getCamThrough() { return m_code.code0 & 0x8000; } - u32 getLinkThrough() { return m_code.code0 & 0x10000; } + u32 getWtr() { return BGPC_CHECK_BIT(m_code.code4, 8); } + u8 getSnd() const { return BGPC_GET_BITS(m_code.code4, 11, 8); } + u8 getRoom() const { return BGPC_GET_BITS(m_code.code4, 20, 8); } /* 0x0 */ sBgPc m_code; }; diff --git a/include/d/d_bg_plc.h b/include/d/d_bg_plc.h index 9823f3367e..997f71da7e 100644 --- a/include/d/d_bg_plc.h +++ b/include/d/d_bg_plc.h @@ -3,15 +3,11 @@ #include "d/d_bg_pc.h" -enum { - /* 0x14 */ ZELDA_CODE_SIZE = 0x14 -}; - -struct PLC { - /* 0x0 */ u32 magic; - /* 0x4 */ u16 m_code_size; - /* 0x6 */ u16 m_num; - /* 0x8 */ sBgPc field_0x8[0]; +struct sBgPlc { + /* 0x0 */ u32 magic; // "SPLC" + /* 0x4 */ u16 m_code_size; // Should normally always be 0x14 + /* 0x6 */ u16 m_num; // Number of sBgPc entries to follow + /* 0x8 */ sBgPc m_code[0]; // m_num size array }; class dBgPlc { @@ -22,8 +18,10 @@ public: /* 800740C4 */ sBgPc* getCode(int, sBgPc**) const; /* 800740DC */ u32 getGrpCode(int) const; + static const int ZELDA_CODE_SIZE = sizeof(sBgPc); + private: - /* 0x00 */ PLC* m_base; + /* 0x00 */ sBgPlc* m_base; }; #endif /* D_BG_D_BG_PLC_H */ diff --git a/include/d/d_bg_w_kcol.h b/include/d/d_bg_w_kcol.h index d8716e31cd..2e08ab82c1 100644 --- a/include/d/d_bg_w_kcol.h +++ b/include/d/d_bg_w_kcol.h @@ -1,6 +1,7 @@ #ifndef D_BG_D_BG_W_KCOL_H #define D_BG_D_BG_W_KCOL_H +#include "JSystem/JUtility/JUTAssert.h" #include "SSystem/SComponent/c_m3d_g_aab.h" #include "d/d_bg_plc.h" #include "d/d_bg_w_base.h" @@ -11,35 +12,28 @@ struct dBgPc; struct dBgS_CaptPoly; struct KC_PrismData { - /* 0x0 */ f32 field_0x0; - /* 0x4 */ u16 field_0x4; - /* 0x6 */ u16 field_0x6; - /* 0x8 */ u16 field_0x8; - /* 0xA */ u16 field_0xa; - /* 0xC */ u16 field_0xc; - /* 0xE */ u16 field_0xe; + /* 0x0 */ f32 height; + /* 0x4 */ u16 pos_i; + /* 0x6 */ u16 fnrm_i; + /* 0x8 */ u16 enrm1_i; + /* 0xA */ u16 enrm2_i; + /* 0xC */ u16 enrm3_i; + /* 0xE */ u16 attribute; }; // Size: 0x10 -struct pkcdata { - /* 0x00 */ Vec* field_0x0; - /* 0x04 */ Vec* field_0x4; +struct KC_Header { + /* 0x00 */ Vec* m_pos_data; + /* 0x04 */ Vec* m_nrm_data; /* 0x08 */ KC_PrismData* m_prism_data; /* 0x0C */ KC_PrismData* m_block_data; - /* 0x10 */ u8 field_0x10[4]; + /* 0x10 */ f32 m_prism_thickness; /* 0x14 */ Vec m_area_min_pos; - /* 0x20 */ u32 field_0x20; - /* 0x24 */ u32 field_0x24; - /* 0x28 */ u32 field_0x28; - /* 0x2C */ u32 field_0x2c; - /* 0x30 */ u32 field_0x30; - /* 0x34 */ u32 field_0x34; -}; - -struct KCol_Header { - /* 0x0 */ u32 pos_data_offset; - /* 0x4 */ u32 nrm_data_offset; - /* 0x8 */ u32 prism_data_offset; - /* 0xC */ u32 block_data_offset; + /* 0x20 */ u32 m_area_x_width_mask; + /* 0x24 */ u32 m_area_y_width_mask; + /* 0x28 */ u32 m_area_z_width_mask; + /* 0x2C */ u32 m_block_width_shift; + /* 0x30 */ u32 m_area_x_blocks_shift; + /* 0x34 */ u32 m_area_xy_blocks_shift; }; class dBgWKCol : public dBgW_Base { @@ -113,11 +107,16 @@ public: /* 80082F94 */ virtual void MatrixCrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*); - KC_PrismData* getPrismData(int poly_index) const { return &m_pkc_head->m_prism_data[poly_index]; } - void getTri1Pos(KC_PrismData* pd, Vec** nrm) const { *nrm = &m_pkc_head->field_0x0[pd->field_0x4]; } + KC_PrismData* getPrismData(int poly_index) const { + KC_PrismData* pd = &m_pkc_head->m_prism_data[poly_index]; + JUT_ASSERT(0x12E, pd < (KC_PrismData*)m_pkc_head->m_block_data); + return pd; + } + + void getTri1Pos(KC_PrismData* pd, Vec** nrm) const { *nrm = &m_pkc_head->m_pos_data[pd->pos_i]; } private: - /* 0x18 */ pkcdata* m_pkc_head; + /* 0x18 */ KC_Header* m_pkc_head; /* 0x1C */ dBgPlc m_code; /* 0x20 */ cM3dGAab m_bnd; }; diff --git a/include/d/d_cam_param.h b/include/d/d_cam_param.h index 170c3223b8..48cfa63238 100644 --- a/include/d/d_cam_param.h +++ b/include/d/d_cam_param.h @@ -106,7 +106,7 @@ public: int Algorythmn() { return mCurrentStyle->field_0x4; } bool Flag(s32 param_0, u16 param_1) { return mCamStyleData[param_0].field_0x6 & param_1; } - /* 8008858C */ virtual ~dCamParam_c() {} + /* 8008858C */ virtual ~dCamParam_c(); }; class dCamSetup_c { @@ -202,7 +202,7 @@ public: /* 0x0F8 */ f32 field_0xf8; /* 0x0FC vtable */ - /* 800888B8 */ virtual ~dCamSetup_c() {} + /* 800888B8 */ virtual ~dCamSetup_c(); /* 0x100 */ dCstick_c mCStick; /* 0x114 */ dCamBGChk_c mBGChk; diff --git a/include/d/d_camera.h b/include/d/d_camera.h index eb0d120644..9d71570798 100644 --- a/include/d/d_camera.h +++ b/include/d/d_camera.h @@ -51,7 +51,7 @@ struct dCamMapToolData { struct dCamForcusLine { /* 801824C8 */ void Init(); /* 80182560 */ void Draw(); - /* 801825E4 */ void Off(); + /* 801825E4 */ bool Off(); /* 0x00 */ dDlst_effectLine_c mEffectLine; /* 0x38 */ cXyz field_0x38; @@ -227,13 +227,15 @@ public: }; struct Shake { - /* 0x00 */ u8 field_0x0[12]; - /* 0x0C */ int field_0xc; + /* 0x00 */ u8 field_0x0[4]; + /* 0x04 */ u8 field_0x4[4]; + /* 0x08 */ u8 field_0x8[0xC - 0x8]; + /* 0x0C */ s32 m_length; /* 0x10 */ int field_0x10; /* 0x14 */ u8 field_0x14[4]; - /* 0x18 */ cXyz field_0x18; + /* 0x18 */ cXyz m_pos; /* 0x24 */ cXyz field_0x24; - /* 0x30 */ cXyz field_0x30; + /* 0x30 */ cXyz mEyeShake; /* 0x3C */ f32 field_0x3c; /* 0x40 */ cSAngle field_0x40; }; // Size: 0x44 @@ -254,37 +256,37 @@ public: /* 800894C4 */ fopAc_ac_c* getEvActor(char*); /* 800895F4 */ fopAc_ac_c* getEvActor(char*, char*); /* 80089730 */ int pauseEvCamera(); - /* 800897E8 */ void fixedFrameEvCamera(); - /* 8008A510 */ void stokerEvCamera(); - /* 8008A974 */ void rollingEvCamera(); - /* 8008B9B0 */ void fixedPositionEvCamera(); - /* 8008BE2C */ void uniformTransEvCamera(); - /* 8008BE50 */ void uniformBrakeEvCamera(); - /* 8008BE74 */ void uniformAcceleEvCamera(); + /* 800897E8 */ int fixedFrameEvCamera(); + /* 8008A510 */ int stokerEvCamera(); + /* 8008A974 */ int rollingEvCamera(); + /* 8008B9B0 */ int fixedPositionEvCamera(); + /* 8008BE2C */ int uniformTransEvCamera(); + /* 8008BE50 */ int uniformBrakeEvCamera(); + /* 8008BE74 */ int uniformAcceleEvCamera(); /* 8008BE98 */ void transEvCamera(int); - /* 8008E938 */ void watchActorEvCamera(); - /* 8008FAE8 */ void restorePosEvCamera(); - /* 80090174 */ void talktoEvCamera(); + /* 8008E938 */ int watchActorEvCamera(); + /* 8008FAE8 */ int restorePosEvCamera(); + /* 80090174 */ int talktoEvCamera(); /* 80090230 */ bool maptoolIdEvCamera(); - /* 80090478 */ bool styleEvCamera(); - /* 80090514 */ void gameOverEvCamera(); - /* 80091468 */ void tactEvCamera(); - /* 800923B8 */ bool turnToActorEvCamera(); - /* 800923C0 */ bool stbWaitEvCamera(); - /* 800924D0 */ bool saveEvCamera(); - /* 8009258C */ void loadEvCamera(); - /* 800929AC */ void useItem0EvCamera(); - /* 800937AC */ void useItem1EvCamera(); - /* 80094240 */ void getItemEvCamera(); - /* 80094A70 */ void possessedEvCamera(); - /* 80095010 */ void fixedFramesEvCamera(); - /* 8009544C */ void bSplineEvCamera(); - /* 800956E4 */ void twoActor0EvCamera(); - /* 80095E7C */ void peepHoleEvCamera(); - /* 80095FD0 */ void digHoleEvCamera(); - /* 800965AC */ void hintTalkEvCamera(); - /* 80096EDC */ void bspTransEvCamera(); - /* 80097694 */ bool portalWarpEvCamera(); + /* 80090478 */ int styleEvCamera(); + /* 80090514 */ int gameOverEvCamera(); + /* 80091468 */ int tactEvCamera(); + /* 800923B8 */ int turnToActorEvCamera(); + /* 800923C0 */ int stbWaitEvCamera(); + /* 800924D0 */ int saveEvCamera(); + /* 8009258C */ int loadEvCamera(); + /* 800929AC */ int useItem0EvCamera(); + /* 800937AC */ int useItem1EvCamera(); + /* 80094240 */ int getItemEvCamera(); + /* 80094A70 */ int possessedEvCamera(); + /* 80095010 */ int fixedFramesEvCamera(); + /* 8009544C */ int bSplineEvCamera(); + /* 800956E4 */ int twoActor0EvCamera(); + /* 80095E7C */ int peepHoleEvCamera(); + /* 80095FD0 */ int digHoleEvCamera(); + /* 800965AC */ int hintTalkEvCamera(); + /* 80096EDC */ int bspTransEvCamera(); + /* 80097694 */ int portalWarpEvCamera(); /* 8009771C */ cXyz attentionPos(fopAc_ac_c*); /* 80097738 */ cSAngle directionOf(fopAc_ac_c*); /* 8009775C */ cXyz positionOf(fopAc_ac_c*); @@ -334,7 +336,7 @@ public: /* 80165104 */ void setUSOAngle(); /* 80165158 */ cSAngle getUSOAngle(cSAngle); /* 8016517C */ bool pointInSight(cXyz*); - /* 80167C24 */ void radiusActorInSight(fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*); + /* 80167C24 */ f32 radiusActorInSight(fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*); /* 80165238 */ f32 radiusActorInSight(fopAc_ac_c*, fopAc_ac_c*, cXyz*, cXyz*, f32, s16, f32); /* 801657EC */ f32 groundHeight(cXyz*); /* 801658C0 */ bool lineBGCheck(cXyz*, cXyz*, dBgS_LinChk*, u32); @@ -346,8 +348,8 @@ public: /* 80165FB4 */ void setView(f32, f32, f32, f32); /* 8016608C */ cSAngle forwardCheckAngle(); /* 80166764 */ void bumpCheck(u32); - /* 80167BF8 */ void lineBGCheckBoth(cXyz*, cXyz*, dBgS_LinChk*, u32); - /* 80167CD8 */ void jutOutCheck(cXyz*, f32); + /* 80167BF8 */ bool lineBGCheckBoth(cXyz*, cXyz*, dBgS_LinChk*, u32); + /* 80167CD8 */ BOOL jutOutCheck(cXyz*, f32); /* 80167E3C */ void tooNearEscape(cXyz*); /* 80167EF4 */ f32 getWaterSurfaceHeight(cXyz*); /* 80167FEC */ void checkGroundInfo(); @@ -376,20 +378,20 @@ public: /* 8017E730 */ bool fixedPositionCamera(s32); /* 8017F25C */ bool oneSideCamera(s32); /* 8017F828 */ bool eventCamera(s32); - /* 8018050C */ void currentEvCamera(); + /* 8018050C */ int currentEvCamera(); /* 801806D4 */ bool letCamera(s32); /* 801806DC */ void setEventRecoveryTrans(s16); /* 80180738 */ void runEventRecoveryTrans(); /* 80180A40 */ void EventRecoverNotime(); - /* 80180AA8 */ void Set(cXyz, cXyz); - /* 80180AE0 */ void Set(cXyz, cXyz, f32, s16); - /* 80180B40 */ void Set(cXyz, cXyz, s16, f32); + /* 80180AA8 */ int Set(cXyz, cXyz); + /* 80180AE0 */ int Set(cXyz, cXyz, f32, s16); + /* 80180B40 */ int Set(cXyz, cXyz, s16, f32); /* 80180C18 */ void Reset(cXyz, cXyz); - /* 80180C68 */ void Reset(); + /* 80180C68 */ int Reset(); /* 80180BA0 */ void Reset(cXyz, cXyz, f32, s16); - /* 80180D24 */ void shakeCamera(); - /* 80181000 */ void StartShake(s32, u8*, s32, cXyz); - /* 80181158 */ void StopShake(); + /* 80180D24 */ f32 shakeCamera(); + /* 80181000 */ int StartShake(s32, u8*, s32, cXyz); + /* 80181158 */ int StopShake(); /* 80181170 */ void StartBlure(int, fopAc_ac_c*, f32, f32); /* 801811B8 */ void ResetBlure(); /* 80181208 */ void SetBlureAlpha(f32); @@ -399,9 +401,9 @@ public: /* 80181280 */ void blureCamera(); /* 80181490 */ void onHorseDush(); /* 80181500 */ fopAc_ac_c* GetForceLockOnActor(); - /* 80181534 */ void ForceLockOn(fopAc_ac_c*); - /* 80181560 */ void ForceLockOff(fpc_ProcID); - /* 8018159C */ void ForceLockOff(fopAc_ac_c*); + /* 80181534 */ int ForceLockOn(fopAc_ac_c*); + /* 80181560 */ int ForceLockOff(fpc_ProcID); + /* 8018159C */ int ForceLockOff(fopAc_ac_c*); /* 80181E20 */ cXyz Up(); /* 80181E64 */ cXyz Eye(); /* 80181E98 */ cXyz Center(); @@ -438,6 +440,20 @@ public: attn.LockSoundOn(); } + void SetWindow(f32 param_0, f32 param_1) { + field_0x914 = param_0; + field_0x918 = param_1; + field_0x92c = param_0 / param_1; + } + + s16 U2() { + if (chkFlag(0x10)) { + return field_0x5c.field_0x0.U(); + } else { + return field_0x8c; + } + } + static engine_fn engine_tbl[]; /* 0x000 */ camera_class* field_0x0; @@ -506,7 +522,7 @@ public: /* 0x18C */ u32 field_0x18c; /* 0x190 */ int field_0x190; /* 0x194 */ bool field_0x194; - /* 0x198 */ u32 mLockOnActorID; + /* 0x198 */ fpc_ProcID mLockOnActorID; /* 0x19C */ fopAc_ac_c* mpLockOnActor; /* 0x1A0 */ int mForceLockTimer; /* 0x1A4 */ int mCurMode; @@ -590,13 +606,13 @@ public: /* 0x00 */ u8 field_0x0[4]; /* 0x04 */ int field_0x4; /* 0x08 */ csXyz field_0x8; - /* 0x10 */ fopAc_ac_c* field_0x10; + /* 0x10 */ fopAc_ac_c* mpActor; /* 0x14 */ int field_0x14; - /* 0x18 */ cXyz mBlurePosition; - /* 0x24 */ cXyz mBlureScale; + /* 0x18 */ cXyz mPosition; + /* 0x24 */ cXyz mScale; + /* 0x30 */ f32 mAlpha; } - /* 0x700 */ field_0x700; - /* 0x730 */ f32 mBlureAlpha; + /* 0x700 */ mBlure; /* 0x734 */ f32 field_0x734; /* 0x738 */ f32 field_0x738; /* 0x73C */ f32 field_0x73c; @@ -621,7 +637,8 @@ public: /* 0x860 */ dCamMapToolData field_0x860; /* 0x89C */ dCamMapToolData field_0x89c; /* 0x8D8 */ dCamMapToolData field_0x8d8; - /* 0x914 */ u8 field_0x914[0x91c - 0x914]; + /* 0x914 */ f32 field_0x914; + /* 0x918 */ f32 field_0x918; /* 0x91C */ f32 field_0x91c; /* 0x920 */ f32 mTrimHeight; /* 0x924 */ int mTrimSize; diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index 3ef7369e60..ace4cf2ab8 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -53,6 +53,10 @@ public: f32 getRndValue(f32 param_0, f32 param_1) { return mRnd.getValue(param_0, param_1); } f32 getRndFX(f32 param_0) { return mRnd.getFX(param_0); } + void initRnd(int r0, int r1, int r2) { + mRnd.init(r0, r1, r2); + } + private: /* 0x04 */ cM_rnd_c mRnd; /* 0x10 */ cXyz field_0x10; diff --git a/include/d/d_save.h b/include/d/d_save.h index c4d961f771..6e6d832c56 100644 --- a/include/d/d_save.h +++ b/include/d/d_save.h @@ -5,6 +5,7 @@ #include "SSystem/SComponent/c_xyz.h" #include "dolphin/os/OSTime.h" #include "global.h" +#include "f_pc/f_pc_name.h" #define DEFAULT_SELECT_ITEM_INDEX 0 #define MAX_SELECT_ITEM 4 @@ -73,277 +74,6 @@ enum ItemSlots { /* 0x17 */ SLOT_23 }; -enum ItemTable { - /* 0x0000 */ HEART, - /* 0x0001 */ GREEN_RUPEE, - /* 0x0002 */ BLUE_RUPEE, - /* 0x0003 */ YELLOW_RUPEE, - /* 0x0004 */ RED_RUPEE, - /* 0x0005 */ PURPLE_RUPEE, - /* 0x0006 */ ORANGE_RUPEE, - /* 0x0007 */ SILVER_RUPEE, - /* 0x0008 */ S_MAGIC, - /* 0x0009 */ L_MAGIC, - /* 0x000A */ BOMB_5, - /* 0x000B */ BOMB_10, - /* 0x000C */ BOMB_20, - /* 0x000D */ BOMB_30, - /* 0x000E */ ARROW_10, - /* 0x000F */ ARROW_20, - /* 0x0010 */ ARROW_30, - /* 0x0011 */ ARROW_1, - /* 0x0012 */ PACHINKO_SHOT, - /* 0x0013 */ noentry1, - /* 0x0014 */ noentry2, - /* 0x0015 */ noentry3, - /* 0x0016 */ WATER_BOMB_5, - /* 0x0017 */ WATER_BOMB_10, - /* 0x0018 */ WATER_BOMB_20, - /* 0x0019 */ WATER_BOMB_30, - /* 0x001A */ BOMB_INSECT_5, - /* 0x001B */ BOMB_INSECT_10, - /* 0x001C */ BOMB_INSECT_20, - /* 0x001D */ BOMB_INSECT_30, - /* 0x001E */ RECOVERY_FAILY, - /* 0x001F */ TRIPLE_HEART, - /* 0x0020 */ SMALL_KEY, - /* 0x0021 */ KAKERA_HEART, - /* 0x0022 */ UTAWA_HEART, - /* 0x0023 */ MAP, - /* 0x0024 */ COMPUS, - /* 0x0025 */ DUNGEON_EXIT, - /* 0x0026 */ BOSS_KEY, - /* 0x0027 */ DUNGEON_BACK, - /* 0x0028 */ SWORD, - /* 0x0029 */ MASTER_SWORD, - /* 0x002A */ WOOD_SHIELD, - /* 0x002B */ SHIELD, - /* 0x002C */ HYLIA_SHIELD, - /* 0x002D */ TKS_LETTER, - /* 0x002E */ WEAR_CASUAL, - /* 0x002F */ WEAR_KOKIRI, - /* 0x0030 */ ARMOR, - /* 0x0031 */ WEAR_ZORA, - /* 0x0032 */ MAGIC_LV1, - /* 0x0033 */ DUNGEON_EXIT_2, - /* 0x0034 */ WALLET_LV1, - /* 0x0035 */ WALLET_LV2, - /* 0x0036 */ WALLET_LV3, - /* 0x0037 */ noentry4, - /* 0x0038 */ noentry5, - /* 0x0039 */ noentry6, - /* 0x003A */ noentry7, - /* 0x003B */ noentry8, - /* 0x003C */ noentry9, - /* 0x003D */ ZORAS_JEWEL, - /* 0x003E */ HAWK_EYE, - /* 0x003F */ WOOD_STICK, - /* 0x0040 */ BOOMERANG, - /* 0x0041 */ SPINNER, - /* 0x0042 */ IRONBALL, - /* 0x0043 */ BOW, - /* 0x0044 */ HOOKSHOT, - /* 0x0045 */ HVY_BOOTS, - /* 0x0046 */ COPY_ROD, - /* 0x0047 */ W_HOOKSHOT, - /* 0x0048 */ KANTERA, - /* 0x0049 */ LIGHT_SWORD, - /* 0x004A */ FISHING_ROD_1, - /* 0x004B */ PACHINKO, - /* 0x004C */ COPY_ROD_2, - /* 0x004D */ noentry10, - /* 0x004E */ noentry11, - /* 0x004F */ BOMB_BAG_LV2, - /* 0x0050 */ BOMB_BAG_LV1, - /* 0x0051 */ BOMB_IN_BAG, - /* 0x0052 */ noentry12, - /* 0x0053 */ LIGHT_ARROW, - /* 0x0054 */ ARROW_LV1, - /* 0x0055 */ ARROW_LV2, - /* 0x0056 */ ARROW_LV3, - /* 0x0057 */ noentry13, - /* 0x0058 */ LURE_ROD, - /* 0x0059 */ BOMB_ARROW, - /* 0x005A */ HAWK_ARROW, - /* 0x005B */ BEE_ROD, - /* 0x005C */ JEWEL_ROD, - /* 0x005D */ WORM_ROD, - /* 0x005E */ JEWEL_BEE_ROD, - /* 0x005F */ JEWEL_WORM_ROD, - /* 0x0060 */ EMPTY_BOTTLE, - /* 0x0061 */ RED_BOTTLE, - /* 0x0062 */ GREEN_BOTTLE, - /* 0x0063 */ BLUE_BOTTLE, - /* 0x0064 */ MILK_BOTTLE, - /* 0x0065 */ HALF_MILK_BOTTLE, - /* 0x0066 */ OIL_BOTTLE, - /* 0x0067 */ WATER_BOTTLE, - /* 0x0068 */ OIL_BOTTLE_2, - /* 0x0069 */ RED_BOTTLE_2, - /* 0x006A */ UGLY_SOUP, - /* 0x006B */ HOT_SPRING, - /* 0x006C */ FAIRY, - /* 0x006D */ HOT_SPRING_2, - /* 0x006E */ OIL2, - /* 0x006F */ OIL, - /* 0x0070 */ NORMAL_BOMB, - /* 0x0071 */ WATER_BOMB, - /* 0x0072 */ POKE_BOMB, - /* 0x0073 */ FAIRY_DROP, - /* 0x0074 */ WORM, - /* 0x0075 */ DROP_BOTTLE, - /* 0x0076 */ BEE_CHILD, - /* 0x0077 */ CHUCHU_RARE, - /* 0x0078 */ CHUCHU_RED, - /* 0x0079 */ CHUCHU_BLUE, - /* 0x007A */ CHUCHU_GREEN, - /* 0x007B */ CHUCHU_YELLOW, - /* 0x007C */ CHUCHU_PURPLE, - /* 0x007D */ LV1_SOUP, - /* 0x007E */ LV2_SOUP, - /* 0x007F */ LV3_SOUP, - /* 0x0080 */ LETTER, - /* 0x0081 */ BILL, - /* 0x0082 */ WOOD_STATUE, - /* 0x0083 */ IRIAS_PENDANT, - /* 0x0084 */ HORSE_FLUTE, - /* 0x0085 */ noentry14, - /* 0x0086 */ noentry15, - /* 0x0087 */ noentry16, - /* 0x0088 */ noentry17, - /* 0x0089 */ noentry18, - /* 0x008A */ noentry19, - /* 0x008B */ noentry20, - /* 0x008C */ noentry21, - /* 0x008D */ noentry22, - /* 0x008E */ noentry23, - /* 0x008F */ noentry24, - /* 0x0090 */ RAFRELS_MEMO, - /* 0x0091 */ ASHS_SCRIBBLING, - /* 0x0092 */ noentry25, - /* 0x0093 */ noentry26, - /* 0x0094 */ noentry27, - /* 0x0095 */ noentry28, - /* 0x0096 */ noentry29, - /* 0x0097 */ noentry30, - /* 0x0098 */ noentry31, - /* 0x0099 */ noentry32, - /* 0x009A */ noentry33, - /* 0x009B */ noentry34, - /* 0x009C */ CHUCHU_YELLOW2, - /* 0x009D */ OIL_BOTTLE3, - /* 0x009E */ SHOP_BEE_CHILD, - /* 0x009F */ CHUCHU_BLACK, - /* 0x00A0 */ LIGHT_DROP, - /* 0x00A1 */ DROP_CONTAINER, - /* 0x00A2 */ DROP_CONTAINER02, - /* 0x00A3 */ DROP_CONTAINER03, - /* 0x00A4 */ FILLED_CONTAINER, - /* 0x00A5 */ MIRROR_PIECE_2, - /* 0x00A6 */ MIRROR_PIECE_3, - /* 0x00A7 */ MIRROR_PIECE_4, - /* 0x00A8 */ noentry35, - /* 0x00A9 */ noentry36, - /* 0x00AA */ noentry37, - /* 0x00AB */ noentry38, - /* 0x00AC */ noentry39, - /* 0x00AD */ noentry40, - /* 0x00AE */ noentry41, - /* 0x00AF */ noentry42, - /* 0x00B0 */ SMELL_YELIA_POUCH, - /* 0x00B1 */ SMELL_PUMPKIN, - /* 0x00B2 */ SMELL_POH, - /* 0x00B3 */ SMELL_FISH, - /* 0x00B4 */ SMELL_CHILDREN, - /* 0x00B5 */ SMELL_MEDICINE, - /* 0x00B6 */ noentry43, - /* 0x00B7 */ noentry44, - /* 0x00B8 */ noentry45, - /* 0x00B9 */ noentry46, - /* 0x00BA */ noentry47, - /* 0x00BB */ noentry48, - /* 0x00BC */ noentry49, - /* 0x00BD */ noentry50, - /* 0x00BE */ noentry51, - /* 0x00BF */ noentry52, - /* 0x00C0 */ M_BEETLE, - /* 0x00C1 */ F_BEETLE, - /* 0x00C2 */ M_BUTTERFLY, - /* 0x00C3 */ F_BUTTERFLY, - /* 0x00C4 */ M_STAG_BEETLE, - /* 0x00C5 */ F_STAG_BEETLE, - /* 0x00C6 */ M_GRASSHOPPER, - /* 0x00C7 */ F_GRASSHOPPER, - /* 0x00C8 */ M_NANAFUSHI, - /* 0x00C9 */ F_NANAFUSHI, - /* 0x00CA */ M_DANGOMUSHI, - /* 0x00CB */ F_DANGOMUSHI, - /* 0x00CC */ M_MANTIS, - /* 0x00CD */ F_MANTIS, - /* 0x00CE */ M_LADYBUG, - /* 0x00CF */ F_LADYBUG, - /* 0x00D0 */ M_SNAIL, - /* 0x00D1 */ F_SNAIL, - /* 0x00D2 */ M_DRAGONFLY, - /* 0x00D3 */ F_DRAGONFLY, - /* 0x00D4 */ M_ANT, - /* 0x00D5 */ F_ANT, - /* 0x00D6 */ M_MAYFLY, - /* 0x00D7 */ F_MAYFLY, - /* 0x00D8 */ noentry53, - /* 0x00D9 */ noentry54, - /* 0x00DA */ noentry55, - /* 0x00DB */ noentry56, - /* 0x00DC */ noentry57, - /* 0x00DD */ noentry58, - /* 0x00DE */ noentry59, - /* 0x00DF */ noentry60, - /* 0x00E0 */ POU_SPIRIT, - /* 0x00E1 */ noentry61, - /* 0x00E2 */ noentry62, - /* 0x00E3 */ noentry63, - /* 0x00E4 */ noentry64, - /* 0x00E5 */ noentry65, - /* 0x00E6 */ noentry66, - /* 0x00E7 */ noentry67, - /* 0x00E8 */ noentry68, - /* 0x00E9 */ ANCIENT_DOCUMENT, - /* 0x00EA */ AIR_LETTER, - /* 0x00EB */ ANCIENT_DOCUMENT2, - /* 0x00EC */ LV7_DUNGEON_EXIT, - /* 0x00ED */ LINKS_SAVINGS, - /* 0x00EE */ SMALL_KEY2, - /* 0x00EF */ POU_FIRE1, - /* 0x00F0 */ POU_FIRE2, - /* 0x00F1 */ POU_FIRE3, - /* 0x00F2 */ POU_FIRE4, - /* 0x00F3 */ BOSSRIDER_KEY, - /* 0x00F4 */ TOMATO_PUREE, - /* 0x00F5 */ TASTE, - /* 0x00F6 */ LV5_BOSS_KEY, - /* 0x00F7 */ SURFBOARD, - /* 0x00F8 */ KANTERA2, - /* 0x00F9 */ L2_KEY_PIECES1, - /* 0x00FA */ L2_KEY_PIECES2, - /* 0x00FB */ L2_KEY_PIECES3, - /* 0x00FC */ KEY_OF_CARAVAN, - /* 0x00FD */ LV2_BOSS_KEY, - /* 0x00FE */ KEY_OF_FILONE, - /* 0x00FF */ NO_ITEM, - /* 0x0100 */ noentry69, - /* 0x0101 */ noentry70, - /* 0x0102 */ noentry71, - /* 0x0103 */ EQUIP_SWORD, - /* 0x0104 */ noentry72, - /* 0x0105 */ noentry73, - /* 0x0106 */ noentry74, - /* 0x0107 */ noentry75, - /* 0x0108 */ noentry76, - /* 0x0109 */ noentry77, - /* 0x010A */ noentry78, - /* 0x010B */ noentry79, -}; - enum CollectItem { /* 0x0 */ COLLECT_CLOTHING, /* 0x1 */ COLLECT_SWORD, diff --git a/include/d/d_stage.h b/include/d/d_stage.h index e343b1da66..93a30143db 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -1112,6 +1112,10 @@ inline u8 dStage_stagInfo_DefaultCameraType(stage_stag_info_class* pstag) { return pstag->mCameraType; } +inline u16 dStage_stagInfo_GetCullPoint(stage_stag_info_class* pstag) { + return pstag->field_0x10 & 0xFFFF; +} + inline u8 dStage_sclsInfo_getSceneLayer(stage_scls_info_class* p_info) { return p_info->field_0xb & 0xF; } diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 041458e78d..c17a35b667 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -768,4 +768,24 @@ inline void fopAcM_effSmokeSet2(u32* param_0, u32* param_1, cXyz const* param_2, fopAcM_effSmokeSet1(param_0, param_1, param_2, param_3, param_4, param_5, 0); } +inline void fopAcM_setWarningMessage_f(const fopAc_ac_c* i_actor, const char* i_filename, int i_line, const char* i_msg, ...) { +#ifdef DEBUG + va_list args; + va_start(args, i_msg); + + char buf[64]; + snprintf(buf, sizeof(buf), "<%s> %s", dStage_getName(fopAcM_GetProfName(i_actor), i_actor->subtype), i_msg); + setWarningMessage_f_va(JUTAssertion::getSDevice(), i_filename, i_line, buf, args); + + va_end(args); +#endif +} + +#ifdef DEBUG +#define fopAcM_setWarningMessage(i_actor, i_filename, i_line, i_msg, ...) \ + fopAcM_setWarningMessage_f(i_actor, i_filename, i_line, i_msg, __VA_ARGS__) +#else +#define fopAcM_setWarningMessage(...) +#endif + #endif diff --git a/include/f_pc/f_pc_name.h b/include/f_pc/f_pc_name.h new file mode 100644 index 0000000000..1a837d3807 --- /dev/null +++ b/include/f_pc/f_pc_name.h @@ -0,0 +1,270 @@ + +#ifndef F_PC_NAME_H_ +#define F_PC_NAME_H_ + +/** + * This is a made up header based on a debug assert from d_a_obj_item: + * "OS_REPORT_ERROR("fpcNm_(ITEM)では扱わないアイテムです<%d>\n", m_itemNo)" + * Making an assumption that `Nm` is shorthand for `Name` + */ + +enum fpcNm_ITEM { + /* 0x00 */ fpcNm_ITEM_HEART, + /* 0x01 */ fpcNm_ITEM_GREEN_RUPEE, + /* 0x02 */ fpcNm_ITEM_BLUE_RUPEE, + /* 0x03 */ fpcNm_ITEM_YELLOW_RUPEE, + /* 0x04 */ fpcNm_ITEM_RED_RUPEE, + /* 0x05 */ fpcNm_ITEM_PURPLE_RUPEE, + /* 0x06 */ fpcNm_ITEM_ORANGE_RUPEE, + /* 0x07 */ fpcNm_ITEM_SILVER_RUPEE, + /* 0x08 */ fpcNm_ITEM_S_MAGIC, + /* 0x09 */ fpcNm_ITEM_L_MAGIC, + /* 0x0A */ fpcNm_ITEM_BOMB_5, + /* 0x0B */ fpcNm_ITEM_BOMB_10, + /* 0x0C */ fpcNm_ITEM_BOMB_20, + /* 0x0D */ fpcNm_ITEM_BOMB_30, + /* 0x0E */ fpcNm_ITEM_ARROW_10, + /* 0x0F */ fpcNm_ITEM_ARROW_20, + /* 0x10 */ fpcNm_ITEM_ARROW_30, + /* 0x11 */ fpcNm_ITEM_ARROW_1, + /* 0x12 */ fpcNm_ITEM_PACHINKO_SHOT, + /* 0x13 */ fpcNm_ITEM_NOENTRY_19, + /* 0x14 */ fpcNm_ITEM_NOENTRY_20, + /* 0x15 */ fpcNm_ITEM_NOENTRY_21, + /* 0x16 */ fpcNm_ITEM_WATER_BOMB_5, + /* 0x17 */ fpcNm_ITEM_WATER_BOMB_10, + /* 0x18 */ fpcNm_ITEM_WATER_BOMB_20, + /* 0x19 */ fpcNm_ITEM_WATER_BOMB_30, + /* 0x1A */ fpcNm_ITEM_BOMB_INSECT_5, + /* 0x1B */ fpcNm_ITEM_BOMB_INSECT_10, + /* 0x1C */ fpcNm_ITEM_BOMB_INSECT_20, + /* 0x1D */ fpcNm_ITEM_BOMB_INSECT_30, + /* 0x1E */ fpcNm_ITEM_RECOVERY_FAILY, + /* 0x1F */ fpcNm_ITEM_TRIPLE_HEART, + /* 0x20 */ fpcNm_ITEM_SMALL_KEY, + /* 0x21 */ fpcNm_ITEM_KAKERA_HEART, + /* 0x22 */ fpcNm_ITEM_UTAWA_HEART, + /* 0x23 */ fpcNm_ITEM_MAP, + /* 0x24 */ fpcNm_ITEM_COMPUS, + /* 0x25 */ fpcNm_ITEM_DUNGEON_EXIT, + /* 0x26 */ fpcNm_ITEM_BOSS_KEY, + /* 0x27 */ fpcNm_ITEM_DUNGEON_BACK, + /* 0x28 */ fpcNm_ITEM_SWORD, + /* 0x29 */ fpcNm_ITEM_MASTER_SWORD, + /* 0x2A */ fpcNm_ITEM_WOOD_SHIELD, + /* 0x2B */ fpcNm_ITEM_SHIELD, + /* 0x2C */ fpcNm_ITEM_HYLIA_SHIELD, + /* 0x2D */ fpcNm_ITEM_TKS_LETTER, + /* 0x2E */ fpcNm_ITEM_WEAR_CASUAL, + /* 0x2F */ fpcNm_ITEM_WEAR_KOKIRI, + /* 0x30 */ fpcNm_ITEM_ARMOR, + /* 0x31 */ fpcNm_ITEM_WEAR_ZORA, + /* 0x32 */ fpcNm_ITEM_MAGIC_LV1, + /* 0x33 */ fpcNm_ITEM_DUNGEON_EXIT_2, + /* 0x34 */ fpcNm_ITEM_WALLET_LV1, + /* 0x35 */ fpcNm_ITEM_WALLET_LV2, + /* 0x36 */ fpcNm_ITEM_WALLET_LV3, + /* 0x37 */ fpcNm_ITEM_NOENTRY_55, + /* 0x38 */ fpcNm_ITEM_NOENTRY_56, + /* 0x39 */ fpcNm_ITEM_NOENTRY_57, + /* 0x3A */ fpcNm_ITEM_NOENTRY_58, + /* 0x3B */ fpcNm_ITEM_NOENTRY_59, + /* 0x3C */ fpcNm_ITEM_NOENTRY_60, + /* 0x3D */ fpcNm_ITEM_ZORAS_JEWEL, + /* 0x3E */ fpcNm_ITEM_HAWK_EYE, + /* 0x3F */ fpcNm_ITEM_WOOD_STICK, + /* 0x40 */ fpcNm_ITEM_BOOMERANG, + /* 0x41 */ fpcNm_ITEM_SPINNER, + /* 0x42 */ fpcNm_ITEM_IRONBALL, + /* 0x43 */ fpcNm_ITEM_BOW, + /* 0x44 */ fpcNm_ITEM_HOOKSHOT, + /* 0x45 */ fpcNm_ITEM_HVY_BOOTS, + /* 0x46 */ fpcNm_ITEM_COPY_ROD, + /* 0x47 */ fpcNm_ITEM_W_HOOKSHOT, + /* 0x48 */ fpcNm_ITEM_KANTERA, + /* 0x49 */ fpcNm_ITEM_LIGHT_SWORD, + /* 0x4A */ fpcNm_ITEM_FISHING_ROD_1, + /* 0x4B */ fpcNm_ITEM_PACHINKO, + /* 0x4C */ fpcNm_ITEM_COPY_ROD_2, + /* 0x4D */ fpcNm_ITEM_NOENTRY_77, + /* 0x4E */ fpcNm_ITEM_NOENTRY_78, + /* 0x4F */ fpcNm_ITEM_BOMB_BAG_LV2, + /* 0x50 */ fpcNm_ITEM_BOMB_BAG_LV1, + /* 0x51 */ fpcNm_ITEM_BOMB_IN_BAG, + /* 0x52 */ fpcNm_ITEM_NOENTRY_82, + /* 0x53 */ fpcNm_ITEM_LIGHT_ARROW, + /* 0x54 */ fpcNm_ITEM_ARROW_LV1, + /* 0x55 */ fpcNm_ITEM_ARROW_LV2, + /* 0x56 */ fpcNm_ITEM_ARROW_LV3, + /* 0x57 */ fpcNm_ITEM_NOENTRY_87, + /* 0x58 */ fpcNm_ITEM_LURE_ROD, + /* 0x59 */ fpcNm_ITEM_BOMB_ARROW, + /* 0x5A */ fpcNm_ITEM_HAWK_ARROW, + /* 0x5B */ fpcNm_ITEM_BEE_ROD, + /* 0x5C */ fpcNm_ITEM_JEWEL_ROD, + /* 0x5D */ fpcNm_ITEM_WORM_ROD, + /* 0x5E */ fpcNm_ITEM_JEWEL_BEE_ROD, + /* 0x5F */ fpcNm_ITEM_JEWEL_WORM_ROD, + /* 0x60 */ fpcNm_ITEM_EMPTY_BOTTLE, + /* 0x61 */ fpcNm_ITEM_RED_BOTTLE, + /* 0x62 */ fpcNm_ITEM_GREEN_BOTTLE, + /* 0x63 */ fpcNm_ITEM_BLUE_BOTTLE, + /* 0x64 */ fpcNm_ITEM_MILK_BOTTLE, + /* 0x65 */ fpcNm_ITEM_HALF_MILK_BOTTLE, + /* 0x66 */ fpcNm_ITEM_OIL_BOTTLE, + /* 0x67 */ fpcNm_ITEM_WATER_BOTTLE, + /* 0x68 */ fpcNm_ITEM_OIL_BOTTLE_2, + /* 0x69 */ fpcNm_ITEM_RED_BOTTLE_2, + /* 0x6A */ fpcNm_ITEM_UGLY_SOUP, + /* 0x6B */ fpcNm_ITEM_HOT_SPRING, + /* 0x6C */ fpcNm_ITEM_FAIRY, + /* 0x6D */ fpcNm_ITEM_HOT_SPRING_2, + /* 0x6E */ fpcNm_ITEM_OIL2, + /* 0x6F */ fpcNm_ITEM_OIL, + /* 0x70 */ fpcNm_ITEM_NORMAL_BOMB, + /* 0x71 */ fpcNm_ITEM_WATER_BOMB, + /* 0x72 */ fpcNm_ITEM_POKE_BOMB, + /* 0x73 */ fpcNm_ITEM_FAIRY_DROP, + /* 0x74 */ fpcNm_ITEM_WORM, + /* 0x75 */ fpcNm_ITEM_DROP_BOTTLE, + /* 0x76 */ fpcNm_ITEM_BEE_CHILD, + /* 0x77 */ fpcNm_ITEM_CHUCHU_RARE, + /* 0x78 */ fpcNm_ITEM_CHUCHU_RED, + /* 0x79 */ fpcNm_ITEM_CHUCHU_BLUE, + /* 0x7A */ fpcNm_ITEM_CHUCHU_GREEN, + /* 0x7B */ fpcNm_ITEM_CHUCHU_YELLOW, + /* 0x7C */ fpcNm_ITEM_CHUCHU_PURPLE, + /* 0x7D */ fpcNm_ITEM_LV1_SOUP, + /* 0x7E */ fpcNm_ITEM_LV2_SOUP, + /* 0x7F */ fpcNm_ITEM_LV3_SOUP, + /* 0x80 */ fpcNm_ITEM_LETTER, + /* 0x81 */ fpcNm_ITEM_BILL, + /* 0x82 */ fpcNm_ITEM_WOOD_STATUE, + /* 0x83 */ fpcNm_ITEM_IRIAS_PENDANT, + /* 0x84 */ fpcNm_ITEM_HORSE_FLUTE, + /* 0x85 */ fpcNm_ITEM_NOENTRY_133, + /* 0x86 */ fpcNm_ITEM_NOENTRY_134, + /* 0x87 */ fpcNm_ITEM_NOENTRY_135, + /* 0x88 */ fpcNm_ITEM_NOENTRY_136, + /* 0x89 */ fpcNm_ITEM_NOENTRY_137, + /* 0x8A */ fpcNm_ITEM_NOENTRY_138, + /* 0x8B */ fpcNm_ITEM_NOENTRY_139, + /* 0x8C */ fpcNm_ITEM_NOENTRY_140, + /* 0x8D */ fpcNm_ITEM_NOENTRY_141, + /* 0x8E */ fpcNm_ITEM_NOENTRY_142, + /* 0x8F */ fpcNm_ITEM_NOENTRY_143, + /* 0x90 */ fpcNm_ITEM_RAFRELS_MEMO, + /* 0x91 */ fpcNm_ITEM_ASHS_SCRIBBLING, + /* 0x92 */ fpcNm_ITEM_NOENTRY_146, + /* 0x93 */ fpcNm_ITEM_NOENTRY_147, + /* 0x94 */ fpcNm_ITEM_NOENTRY_148, + /* 0x95 */ fpcNm_ITEM_NOENTRY_149, + /* 0x96 */ fpcNm_ITEM_NOENTRY_150, + /* 0x97 */ fpcNm_ITEM_NOENTRY_151, + /* 0x98 */ fpcNm_ITEM_NOENTRY_152, + /* 0x99 */ fpcNm_ITEM_NOENTRY_153, + /* 0x9A */ fpcNm_ITEM_NOENTRY_154, + /* 0x9B */ fpcNm_ITEM_NOENTRY_155, + /* 0x9C */ fpcNm_ITEM_CHUCHU_YELLOW2, + /* 0x9D */ fpcNm_ITEM_OIL_BOTTLE3, + /* 0x9E */ fpcNm_ITEM_SHOP_BEE_CHILD, + /* 0x9F */ fpcNm_ITEM_CHUCHU_BLACK, + /* 0xA0 */ fpcNm_ITEM_LIGHT_DROP, + /* 0xA1 */ fpcNm_ITEM_DROP_CONTAINER, + /* 0xA2 */ fpcNm_ITEM_DROP_CONTAINER02, + /* 0xA3 */ fpcNm_ITEM_DROP_CONTAINER03, + /* 0xA4 */ fpcNm_ITEM_FILLED_CONTAINER, + /* 0xA5 */ fpcNm_ITEM_MIRROR_PIECE_2, + /* 0xA6 */ fpcNm_ITEM_MIRROR_PIECE_3, + /* 0xA7 */ fpcNm_ITEM_MIRROR_PIECE_4, + /* 0xA8 */ fpcNm_ITEM_NOENTRY_168, + /* 0xA9 */ fpcNm_ITEM_NOENTRY_169, + /* 0xAA */ fpcNm_ITEM_NOENTRY_170, + /* 0xAB */ fpcNm_ITEM_NOENTRY_171, + /* 0xAC */ fpcNm_ITEM_NOENTRY_172, + /* 0xAD */ fpcNm_ITEM_NOENTRY_173, + /* 0xAE */ fpcNm_ITEM_NOENTRY_174, + /* 0xAF */ fpcNm_ITEM_NOENTRY_175, + /* 0xB0 */ fpcNm_ITEM_SMELL_YELIA_POUCH, + /* 0xB1 */ fpcNm_ITEM_SMELL_PUMPKIN, + /* 0xB2 */ fpcNm_ITEM_SMELL_POH, + /* 0xB3 */ fpcNm_ITEM_SMELL_FISH, + /* 0xB4 */ fpcNm_ITEM_SMELL_CHILDREN, + /* 0xB5 */ fpcNm_ITEM_SMELL_MEDICINE, + /* 0xB6 */ fpcNm_ITEM_NOENTRY_182, + /* 0xB7 */ fpcNm_ITEM_NOENTRY_183, + /* 0xB8 */ fpcNm_ITEM_NOENTRY_184, + /* 0xB9 */ fpcNm_ITEM_NOENTRY_185, + /* 0xBA */ fpcNm_ITEM_NOENTRY_186, + /* 0xBB */ fpcNm_ITEM_NOENTRY_187, + /* 0xBC */ fpcNm_ITEM_NOENTRY_188, + /* 0xBD */ fpcNm_ITEM_NOENTRY_189, + /* 0xBE */ fpcNm_ITEM_NOENTRY_190, + /* 0xBF */ fpcNm_ITEM_NOENTRY_191, + /* 0xC0 */ fpcNm_ITEM_M_BEETLE, + /* 0xC1 */ fpcNm_ITEM_F_BEETLE, + /* 0xC2 */ fpcNm_ITEM_M_BUTTERFLY, + /* 0xC3 */ fpcNm_ITEM_F_BUTTERFLY, + /* 0xC4 */ fpcNm_ITEM_M_STAG_BEETLE, + /* 0xC5 */ fpcNm_ITEM_F_STAG_BEETLE, + /* 0xC6 */ fpcNm_ITEM_M_GRASSHOPPER, + /* 0xC7 */ fpcNm_ITEM_F_GRASSHOPPER, + /* 0xC8 */ fpcNm_ITEM_M_NANAFUSHI, + /* 0xC9 */ fpcNm_ITEM_F_NANAFUSHI, + /* 0xCA */ fpcNm_ITEM_M_DANGOMUSHI, + /* 0xCB */ fpcNm_ITEM_F_DANGOMUSHI, + /* 0xCC */ fpcNm_ITEM_M_MANTIS, + /* 0xCD */ fpcNm_ITEM_F_MANTIS, + /* 0xCE */ fpcNm_ITEM_M_LADYBUG, + /* 0xCF */ fpcNm_ITEM_F_LADYBUG, + /* 0xD0 */ fpcNm_ITEM_M_SNAIL, + /* 0xD1 */ fpcNm_ITEM_F_SNAIL, + /* 0xD2 */ fpcNm_ITEM_M_DRAGONFLY, + /* 0xD3 */ fpcNm_ITEM_F_DRAGONFLY, + /* 0xD4 */ fpcNm_ITEM_M_ANT, + /* 0xD5 */ fpcNm_ITEM_F_ANT, + /* 0xD6 */ fpcNm_ITEM_M_MAYFLY, + /* 0xD7 */ fpcNm_ITEM_F_MAYFLY, + /* 0xD8 */ fpcNm_ITEM_NOENTRY_216, + /* 0xD9 */ fpcNm_ITEM_NOENTRY_217, + /* 0xDA */ fpcNm_ITEM_NOENTRY_218, + /* 0xDB */ fpcNm_ITEM_NOENTRY_219, + /* 0xDC */ fpcNm_ITEM_NOENTRY_220, + /* 0xDD */ fpcNm_ITEM_NOENTRY_221, + /* 0xDE */ fpcNm_ITEM_NOENTRY_222, + /* 0xDF */ fpcNm_ITEM_NOENTRY_223, + /* 0xE0 */ fpcNm_ITEM_POU_SPIRIT, + /* 0xE1 */ fpcNm_ITEM_NOENTRY_225, + /* 0xE2 */ fpcNm_ITEM_NOENTRY_226, + /* 0xE3 */ fpcNm_ITEM_NOENTRY_227, + /* 0xE4 */ fpcNm_ITEM_NOENTRY_228, + /* 0xE5 */ fpcNm_ITEM_NOENTRY_229, + /* 0xE6 */ fpcNm_ITEM_NOENTRY_230, + /* 0xE7 */ fpcNm_ITEM_NOENTRY_231, + /* 0xE8 */ fpcNm_ITEM_NOENTRY_232, + /* 0xE9 */ fpcNm_ITEM_ANCIENT_DOCUMENT, + /* 0xEA */ fpcNm_ITEM_AIR_LETTER, + /* 0xEB */ fpcNm_ITEM_ANCIENT_DOCUMENT2, + /* 0xEC */ fpcNm_ITEM_LV7_DUNGEON_EXIT, + /* 0xED */ fpcNm_ITEM_LINKS_SAVINGS, + /* 0xEE */ fpcNm_ITEM_SMALL_KEY2, + /* 0xEF */ fpcNm_ITEM_POU_FIRE1, + /* 0xF0 */ fpcNm_ITEM_POU_FIRE2, + /* 0xF1 */ fpcNm_ITEM_POU_FIRE3, + /* 0xF2 */ fpcNm_ITEM_POU_FIRE4, + /* 0xF3 */ fpcNm_ITEM_BOSSRIDER_KEY, + /* 0xF4 */ fpcNm_ITEM_TOMATO_PUREE, + /* 0xF5 */ fpcNm_ITEM_TASTE, + /* 0xF6 */ fpcNm_ITEM_LV5_BOSS_KEY, + /* 0xF7 */ fpcNm_ITEM_SURFBOARD, + /* 0xF8 */ fpcNm_ITEM_KANTERA2, + /* 0xF9 */ fpcNm_ITEM_L2_KEY_PIECES1, + /* 0xFA */ fpcNm_ITEM_L2_KEY_PIECES2, + /* 0xFB */ fpcNm_ITEM_L2_KEY_PIECES3, + /* 0xFC */ fpcNm_ITEM_KEY_OF_CARAVAN, + /* 0xFD */ fpcNm_ITEM_LV2_BOSS_KEY, + /* 0xFE */ fpcNm_ITEM_KEY_OF_FILONE, + /* 0xFF */ fpcNm_ITEM_NONE, +}; + +#endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h index 98930d6e96..7d97141670 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h @@ -3,6 +3,11 @@ namespace std { +template +inline double fabs(T x) { + return ::fabs(x); +} + inline float fabs(float num) { return ::fabsf(num); } diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index 9b6304a5a4..207c76cd6b 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -61,7 +61,7 @@ u8 struct_80450FBC[4]; static fopAc_ac_c* daAlink_searchTagKandelaar(fopAc_ac_c* i_actor, void* i_data); /* 8009D87C-8009D884 0981BC 0008+00 0/0 1/1 0/0 .text getE3Zhint__9daAlink_cFv */ -bool daAlink_c::getE3Zhint() { +BOOL daAlink_c::getE3Zhint() { return false; } @@ -133,7 +133,7 @@ bool daAlink_c::checkWindSpeedOnXZ() const { return field_0x35b8.abs2XZ() > 1.0f; } bool daPy_py_c::i_checkShieldGet() const { - return dComIfGs_getSelectEquipShield() != NO_ITEM; + return dComIfGs_getSelectEquipShield() != fpcNm_ITEM_NONE; } u32 daPy_py_c::getLastSceneMode() { return dComIfGs_getLastSceneMode() & 0xF; @@ -1267,7 +1267,7 @@ cXyz* daAlink_c::getNeckAimPos(cXyz* param_0, int* param_1, int param_2) { } } } - } else if (mProcID == PROC_BOTTLE_OPEN && mEquipItem == FAIRY) { + } else if (mProcID == PROC_BOTTLE_OPEN && mEquipItem == fpcNm_ITEM_FAIRY) { var_r29 = field_0x285c.getActor(); } else if (mProcID == PROC_FISHING_CAST || mProcID == PROC_CANOE_FISHING_WAIT || mProcID == PROC_CANOE_FISHING_REEL || mProcID == PROC_CANOE_FISHING_GET) { var_r29 = mItemAcKeep.getActor(); @@ -5510,15 +5510,15 @@ static int daAlink_createHeap(fopAc_ac_c* i_this) { } bool daPy_py_c::checkWoodSwordEquip() { - return dComIfGs_getSelectEquipSword() == WOOD_STICK; + return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_WOOD_STICK; } bool daPy_py_c::checkLightMasterSwordEquip() { - return dComIfGs_getSelectEquipSword() == LIGHT_SWORD; + return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_LIGHT_SWORD; } BOOL daPy_py_c::i_checkSwordGet() { - return dComIfGs_getSelectEquipSword() != NO_ITEM; + return dComIfGs_getSelectEquipSword() != fpcNm_ITEM_NONE; } /* 800A4910-800A4BC8 09F250 02B8+00 5/5 0/0 0/0 .text setSelectEquipItem__9daAlink_cFi */ @@ -5558,12 +5558,12 @@ void daAlink_c::setSelectEquipItem(int param_0) { } if (checkWoodSwordEquip()) { - if (mEquipItem == EQUIP_SWORD || param_0 != 0) { + if (mEquipItem == 0x103 || param_0 != 0) { mSwordModel->getModelData()->getMaterialNodePointer(1)->getShape()->hide(); } else { mSwordModel->getModelData()->getMaterialNodePointer(1)->getShape()->show(); } - } else if (mEquipItem == EQUIP_SWORD || param_0 != 0) { + } else if (mEquipItem == 0x103 || param_0 != 0) { mSwordModel->getModelData()->getMaterialNodePointer(0)->getShape()->show(); } else { mSwordModel->getModelData()->getMaterialNodePointer(0)->getShape()->hide(); @@ -5615,8 +5615,8 @@ u32 daPy_py_c::i_getLastSceneMode() { void daAlink_c::playerInit() { mHeavySpeedMultiplier = 1.0f; - if (!checkDungeon() && !checkBossRoom() && checkItemGet(DUNGEON_EXIT, 1)) { - dComIfGs_setItem(SLOT_18, TKS_LETTER); + if (!checkDungeon() && !checkBossRoom() && checkItemGet(fpcNm_ITEM_DUNGEON_EXIT, 1)) { + dComIfGs_setItem(SLOT_18, fpcNm_ITEM_TKS_LETTER); } u16 i; @@ -5740,7 +5740,7 @@ void daAlink_c::playerInit() { field_0x33b8 = tmp; field_0x33bc = tmp; - mEquipItem = NO_ITEM; + mEquipItem = fpcNm_ITEM_NONE; offSwordModel(); field_0x3184 = -1; @@ -5849,14 +5849,14 @@ int daAlink_c::setStartProcInit() { setFaceBasicAnime(ANM_WAIT); } else { mEquipItem = (dComIfGs_getLastSceneMode() >> 0x18) & 0xFF; - if (mEquipItem == SWORD) { + if (mEquipItem == fpcNm_ITEM_SWORD) { mEquipItem = 0x103; } else if (checkStageName("D_MN09B") && last_mode != 8 && start_mode == 2) { mEquipItem = 0x103; } - if (mEquipItem == 0 || !checkCastleTownUseItem(mEquipItem) || (checkCloudSea() && mEquipItem != 0x103) || checkCanoeStart() || (horse_start && mEquipItem != 0x103 && !checkBowAndSlingItem(mEquipItem) && mEquipItem != BOOMERANG && mEquipItem != KANTERA && !checkHookshotItem(mEquipItem))) { - mEquipItem = NO_ITEM; + if (mEquipItem == 0 || !checkCastleTownUseItem(mEquipItem) || (checkCloudSea() && mEquipItem != 0x103) || checkCanoeStart() || (horse_start && mEquipItem != 0x103 && !checkBowAndSlingItem(mEquipItem) && mEquipItem != fpcNm_ITEM_BOOMERANG && mEquipItem != fpcNm_ITEM_KANTERA && !checkHookshotItem(mEquipItem))) { + mEquipItem = fpcNm_ITEM_NONE; } else { setItemModel(); } @@ -6028,15 +6028,15 @@ static u8 data_80450FD1; #pragma pop inline bool checkCasualWearFlg() { - return dComIfGs_getSelectEquipClothes() == WEAR_CASUAL; + return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_WEAR_CASUAL; } inline bool checkZoraWearFlg() { - return dComIfGs_getSelectEquipClothes() == WEAR_ZORA; + return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_WEAR_ZORA; } inline bool checkMagicArmorWearFlg() { - return dComIfGs_getSelectEquipClothes() == ARMOR; + return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_ARMOR; } /* 800A5CC8-800A660C 0A0608 0944+00 1/1 0/0 0/0 .text create__9daAlink_cFv */ @@ -6057,11 +6057,11 @@ int daAlink_c::create() { if (!bgWaitFlg) { // Event Flag: Finished Sewers if (checkCasualWearFlg() && dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[47])) { - dComIfGs_setSelectEquipClothes(WEAR_KOKIRI); + dComIfGs_setSelectEquipClothes(fpcNm_ITEM_WEAR_KOKIRI); } if (enteringCity && checkMagicArmorHeavy()) { - dComIfGs_setSelectEquipClothes(WEAR_KOKIRI); + dComIfGs_setSelectEquipClothes(fpcNm_ITEM_WEAR_KOKIRI); } dComIfGp_setPlayer(0, this); @@ -6223,8 +6223,8 @@ int daAlink_c::create() { } if (i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) == 0x11) { - if (!dComIfGs_isItemFirstBit(HYLIA_SHIELD) && !dComIfGs_isItemFirstBit(SHIELD) && - !dComIfGs_isItemFirstBit(WOOD_SHIELD)) + if (!dComIfGs_isItemFirstBit(fpcNm_ITEM_HYLIA_SHIELD) && !dComIfGs_isItemFirstBit(fpcNm_ITEM_SHIELD) && + !dComIfGs_isItemFirstBit(fpcNm_ITEM_WOOD_SHIELD)) { fopAcM_onSwitch(this, 0x6F); } else { @@ -7127,7 +7127,7 @@ void daAlink_c::setSwordPos() { if (mEquipItem == 0x10B) { mDoMtx_multVec(getCanoePaddleMatrix(), getCanoeLocalPaddleTop(), &field_0x3720); - } else if (mEquipItem == COPY_ROD) { + } else if (mEquipItem == fpcNm_ITEM_COPY_ROD) { mDoMtx_multVec(mHeldItemModel->getBaseTRMtx(), ©RodTop, &field_0x3720); } else { field_0x3720 = mSwordTopPos; @@ -7169,7 +7169,7 @@ void daAlink_c::setItemMatrix(int param_0) { mZ2Link.setLinkSwordType(var_r28, var_r26); if (mShieldChangeWaitTimer == 0) { - if (param_0 != 0 || (checkPlayerGuardAndAttack() && mEquipItem != IRONBALL && !checkModeFlg(0x400)) || checkNoResetFlg0(FLG0_UNK_2) || (mProcID == PROC_TOOL_DEMO && mProcVar4.field_0x3010 != 0) || (mProcID == PROC_CUT_REVERSE && mProcVar2.field_0x300c != 0) || mProcID == PROC_GUARD_BREAK || (mEquipItem == 0x103 && !checkEndResetFlg1(ERFLG1_GANON_FINISH) && !checkModeFlg(0x400))) { + if (param_0 != 0 || (checkPlayerGuardAndAttack() && mEquipItem != fpcNm_ITEM_IRONBALL && !checkModeFlg(0x400)) || checkNoResetFlg0(FLG0_UNK_2) || (mProcID == PROC_TOOL_DEMO && mProcVar4.field_0x3010 != 0) || (mProcID == PROC_CUT_REVERSE && mProcVar2.field_0x300c != 0) || mProcID == PROC_GUARD_BREAK || (mEquipItem == 0x103 && !checkEndResetFlg1(ERFLG1_GANON_FINISH) && !checkModeFlg(0x400))) { mShieldModel->setBaseTRMtx(mpLinkModel->getAnmMtx(field_0x30c2)); if (i_checkShieldGet()) { @@ -7281,10 +7281,10 @@ void daAlink_c::setItemMatrix(int param_0) { } } else if (checkHookshotItem(mEquipItem)) { setHookshotPos(); - } else if (mEquipItem == IRONBALL) { + } else if (mEquipItem == fpcNm_ITEM_IRONBALL) { setIronBallPos(); } else { - if (mEquipItem == COPY_ROD && mProcID != PROC_COPY_ROD_REVIVE) { + if (mEquipItem == fpcNm_ITEM_COPY_ROD && mProcID != PROC_COPY_ROD_REVIVE) { if (checkCopyRodTopUse()) { field_0x0724->setFrame(field_0x0724->getFrameMax() - 0.001f); } else { @@ -7310,7 +7310,7 @@ void daAlink_c::setItemMatrix(int param_0) { simpleAnmPlay(mpKanteraGlowBtk); if (mProcID != PROC_OPEN_TREASURE && !checkEndResetFlg1(ERFLG1_UNK_4) && (mProcID != PROC_GET_ITEM || mProcVar4.field_0x3010 == 0)) { - if (mEquipItem == KANTERA || checkOilBottleItemNotGet(mEquipItem)) { + if (mEquipItem == fpcNm_ITEM_KANTERA || checkOilBottleItemNotGet(mEquipItem)) { mDoMtx_stack_c::copy(mpLinkModel->getAnmMtx(field_0x30c0)); mDoMtx_stack_c::transM(-2.0f, -0.1f, -0.7f); mDoMtx_stack_c::XYZrotM(cM_deg2s(100.0f), cM_deg2s(9.3f), cM_deg2s(183.0f)); @@ -7625,7 +7625,7 @@ void daAlink_c::setAtCollision() { mAtCps[0].SetAtVec(spA4); dComIfG_Ccsp()->Set(&mAtCps[0]); } else if (mProcID == PROC_BOTTLE_OPEN) { - if (mEquipItem == WATER_BOTTLE && mProcVar4.field_0x3010 != 0) { + if (mEquipItem == fpcNm_ITEM_WATER_BOTTLE && mProcVar4.field_0x3010 != 0) { mDoMtx_multVec(mHeldItemModel->getBaseTRMtx(), &bottleTopPos, &spC8); if (field_0x27c8.getKeepMinY() < spC8.y) { @@ -7741,7 +7741,7 @@ void daAlink_c::setAtCollision() { } else { field_0xFB8.ResetAtHit(); } - } else if (mEquipItem == IRONBALL) { + } else if (mEquipItem == fpcNm_ITEM_IRONBALL) { if (mItemVar0.field_0x3018 == 2 || mItemVar0.field_0x3018 == 3 || mItemVar0.field_0x3018 == 4 || mItemVar0.field_0x3018 == 5 || mItemVar0.field_0x3018 == 7 || mItemVar0.field_0x3018 == 6) { if (field_0xFB8.ChkAtSet()) { @@ -8157,7 +8157,7 @@ static const daAlink_BckData kandelaarAnm[2] = { /* 800AC450-800AC558 0A6D90 0108+00 23/23 0/0 0/0 .text * getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM */ const daAlink_BckData* daAlink_c::getMainBckData(daAlink_c::daAlink_ANM i_anmID) const { - if (mEquipItem == KANTERA) { + if (mEquipItem == fpcNm_ITEM_KANTERA) { if (i_anmID == ANM_WAIT) { return &kandelaarAnm[0]; } @@ -8171,8 +8171,8 @@ const daAlink_BckData* daAlink_c::getMainBckData(daAlink_c::daAlink_ANM i_anmID) return &m_mainBckShield[i_anmID]; } - if ((mEquipItem == EQUIP_SWORD && i_anmID < 0x15 && i_anmID >= 0x10) || - (i_anmID == ANM_SWIM_WAIT && mEquipItem != NO_ITEM)) + if ((mEquipItem == 0x103 && i_anmID < 0x15 && i_anmID >= 0x10) || + (i_anmID == ANM_SWIM_WAIT && mEquipItem != fpcNm_ITEM_NONE)) { return &m_mainBckSword[i_anmID - 0x10]; } @@ -11624,7 +11624,7 @@ void daAlink_c::decideCommonDoStatus() { if (checkRoomOnly() && !checkWolf() && !temp_r3) { if ((checkNoUpperAnime() || checkIronBallWaitAnime()) && - (mEquipItem != NO_ITEM && checkModeFlg(4) && mEquipItem != 0x102)) + (mEquipItem != fpcNm_ITEM_NONE && checkModeFlg(4) && mEquipItem != 0x102)) { if (checkCopyRodControllAnime()) { setDoStatus(0x2A); @@ -11705,7 +11705,7 @@ void daAlink_c::decideCommonDoStatus() { } } else if (((checkNoUpperAnime()) || checkIronBallWaitAnime() || checkCopyRodControllAnime()) && - mEquipItem != NO_ITEM && checkModeFlg(4) && field_0x33a8 <= temp_f31) + mEquipItem != fpcNm_ITEM_NONE && checkModeFlg(4) && field_0x33a8 <= temp_f31) { if (mEquipItem == 0x102) { if (checkAttentionState()) { @@ -12187,7 +12187,7 @@ BOOL daAlink_c::checkAutoJumpAction() { sp18 = 60.0f; } - if (dComIfGs_getLife() != 0 || dComIfGs_checkBottle(FAIRY)) { + if (dComIfGs_getLife() != 0 || dComIfGs_checkBottle(fpcNm_ITEM_FAIRY)) { if (!checkGoronSideMove() && (!checkNotAutoJumpStage() || checkWolf())) { if (field_0x3178 != 3 && !checkEndResetFlg0(ERFLG0_NOT_AUTO_JUMP)) { if (sp14 >= sp10 && (!checkBootsOrArmorHeavy() || checkIronBallWaitAnime()) && (field_0x33a8 > 0.85f || (checkIronBallWaitAnime() && field_0x33ac > 0.85f) || mProcID == PROC_WOLF_GIANT_PUZZLE || checkEndResetFlg0(ERFLG0_FORCE_AUTO_JUMP)) && cLib_distanceAngleS(temp_r26, shape_angle.y) < 0x800) { @@ -12270,7 +12270,7 @@ BOOL daAlink_c::checkAutoJumpAction() { /* 800B69CC-800B6A30 0B130C 0064+00 2/2 0/0 0/0 .text checkCutJumpInFly__9daAlink_cFv */ BOOL daAlink_c::checkCutJumpInFly() { - if ((mEquipItem == EQUIP_SWORD && checkResetFlg0(RFLG0_UNK_80)) || checkForceSwordSwing()) { + if ((mEquipItem == 0x103 && checkResetFlg0(RFLG0_UNK_80)) || checkForceSwordSwing()) { return procCutJumpInit(1); } return false; @@ -12404,9 +12404,9 @@ BOOL daAlink_c::checkFrontWallTypeAction() { int daAlink_c::checkItemActionInitStart() { if (checkBowAndSlingItem(mEquipItem)) { return checkNextActionBow(); - } else if (mEquipItem == BOOMERANG) { + } else if (mEquipItem == fpcNm_ITEM_BOOMERANG) { return checkNextActionBoomerang(); - } else if (mEquipItem == COPY_ROD) { + } else if (mEquipItem == fpcNm_ITEM_COPY_ROD) { if (mCopyRodAcKeep.getActor() == NULL) { return checkNextActionCopyRod(); } @@ -12417,13 +12417,13 @@ int daAlink_c::checkItemActionInitStart() { } else if (checkFishingRodItem(mEquipItem)) { onResetFlg1(RFLG1_UNK_80); return 1; - } else if (mEquipItem == IRONBALL) { + } else if (mEquipItem == fpcNm_ITEM_IRONBALL) { if (!checkIronBallAnime()) { return checkNextActionIronBall(); } - } else if (mEquipItem == EMPTY_BOTTLE) { + } else if (mEquipItem == fpcNm_ITEM_EMPTY_BOTTLE) { return procBottleSwingInit(NULL, 0); - } else if (mEquipItem == KANTERA) { + } else if (mEquipItem == fpcNm_ITEM_KANTERA) { if (!checkModeFlg(0x400)) { return procKandelaarSwingInit(); } @@ -12437,7 +12437,7 @@ int daAlink_c::checkItemActionInitStart() { /* 800B7090-800B7168 0B19D0 00D8+00 1/1 0/0 0/0 .text checkItemChangeAutoAction__9daAlink_cFv */ int daAlink_c::checkItemChangeAutoAction() { if (checkResetFlg0(RFLG0_UNK_80)) { - if (mEquipItem == EQUIP_SWORD) { + if (mEquipItem == 0x103) { if (checkModeFlg(0x40000)) { return 0; } @@ -12486,7 +12486,7 @@ int daAlink_c::cancelUpperItemReadyAnime(int param_0) { { seStartSystem(0x6F); - if (mEquipItem == IRONBALL) { + if (mEquipItem == fpcNm_ITEM_IRONBALL) { mItemVar0.field_0x3018 = 8; procIronBallReturnInit(); } else { @@ -12509,7 +12509,7 @@ BOOL daAlink_c::checkItemActorPointer() { mItemAcKeep.clearData(); resetUpperAnime(UPPER_2, -1.0f); - mEquipItem = NO_ITEM; + mEquipItem = fpcNm_ITEM_NONE; if (checkModeFlg(MODE_RIDING)) { if (checkCanoeRide()) { @@ -12558,9 +12558,9 @@ bool daAlink_c::checkSwordTwirlAction() { BOOL daAlink_c::checkUpperItemActionFly() { if (checkBowAndSlingItem(mEquipItem)) { checkUpperItemActionBowFly(); - } else if (mEquipItem == BOOMERANG) { + } else if (mEquipItem == fpcNm_ITEM_BOOMERANG) { checkUpperItemActionBoomerangFly(); - } else if (mEquipItem == COPY_ROD) { + } else if (mEquipItem == fpcNm_ITEM_COPY_ROD) { checkUpperItemActionCopyRodFly(); } @@ -12570,7 +12570,7 @@ BOOL daAlink_c::checkUpperItemActionFly() { /* 800B7528-800B75EC 0B1E68 00C4+00 1/1 0/0 0/0 .text checkItemButtonChange__9daAlink_cFv */ void daAlink_c::checkItemButtonChange() { - if (mProcID != PROC_CANOE_PADDLE_PUT && mEquipItem != NO_ITEM && !checkEquipAnime()) { + if (mProcID != PROC_CANOE_PADDLE_PUT && mEquipItem != fpcNm_ITEM_NONE && !checkEquipAnime()) { u8 temp_r0; for (u8 i = 0; i < 2; i++) { temp_r0 = (i + 1) % 2; @@ -12588,9 +12588,9 @@ void daAlink_c::checkItemButtonChange() { BOOL daAlink_c::checkUpperItemAction() { if (checkNoUpperAnime()) { if (checkModeFlg(0x1000)) { - if (mEquipItem == IRONBALL) { + if (mEquipItem == fpcNm_ITEM_IRONBALL) { setIronBallWaitUpperAnime(0); - } else if (mEquipItem == COPY_ROD) { + } else if (mEquipItem == fpcNm_ITEM_COPY_ROD) { setCopyRodControllAnime(); } } @@ -12700,9 +12700,9 @@ BOOL daAlink_c::checkUpperItemAction() { if (checkUpperItemActionIronBall()) { return true; } - } else if (mEquipItem == IRONBALL) { + } else if (mEquipItem == fpcNm_ITEM_IRONBALL) { setIronBallWaitUpperAnime(0); - } else if (mEquipItem == COPY_ROD) { + } else if (mEquipItem == fpcNm_ITEM_COPY_ROD) { setCopyRodControllAnime(); } @@ -13005,7 +13005,7 @@ u16 daAlink_c::getReadyItem() { /* 800B8930-800B8988 0B3270 0058+00 11/11 0/0 0/0 .text checkReadyItem__9daAlink_cFv */ bool daAlink_c::checkReadyItem() { - if (mEquipItem == NO_ITEM) { + if (mEquipItem == fpcNm_ITEM_NONE) { return false; } @@ -13318,7 +13318,7 @@ void daAlink_c::swordUnequip() { /* 800B9640-800B96A4 0B3F80 0064+00 6/6 0/0 0/0 .text itemEquip__9daAlink_cFUs */ void daAlink_c::itemEquip(u16 i_itemID) { - if (mThrowBoomerangAcKeep.getActor() == NULL || i_itemID != BOOMERANG) { + if (mThrowBoomerangAcKeep.getActor() == NULL || i_itemID != fpcNm_ITEM_BOOMERANG) { field_0x2fde = i_itemID; dComIfGp_clearPlayerStatus0(0, 0x400000); offNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER); @@ -13337,8 +13337,8 @@ void daAlink_c::itemUnequip(u16 i_itemID, f32 i_playSpeed) { u16 anm_id; const daAlinkHIO_anm_c* anm_data; - if (i_itemID == BOOMERANG || i_itemID == COPY_ROD || i_itemID == KANTERA || - i_itemID == HOOKSHOT || checkBottleItem(i_itemID)) + if (i_itemID == fpcNm_ITEM_BOOMERANG || i_itemID == fpcNm_ITEM_COPY_ROD || i_itemID == fpcNm_ITEM_KANTERA || + i_itemID == fpcNm_ITEM_HOOKSHOT || checkBottleItem(i_itemID)) { anm_id = 0x247; anm_data = &daAlinkHIO_item_c0::m.mOneHandEquipAnm; @@ -13373,19 +13373,19 @@ bool daAlink_c::checkFastUnequip() { /* 800B983C-800B994C 0B417C 0110+00 10/10 0/0 0/0 .text allUnequip__9daAlink_cFi */ void daAlink_c::allUnequip(int param_0) { if (checkNoResetFlg2(FLG2_UNK_1) && param_0 != 0 && !checkCanoeRide() && - mEquipItem != KANTERA) + mEquipItem != fpcNm_ITEM_KANTERA) { for (u8 i = 0; i < 2; i++) { - if (dComIfGp_getSelectItem(i) == KANTERA) { + if (dComIfGp_getSelectItem(i) == fpcNm_ITEM_KANTERA) { mSelectItemId = i; } } - itemEquip(KANTERA); + itemEquip(fpcNm_ITEM_KANTERA); onNoResetFlg1(FLG1_UNK_40); return; - } else if (mEquipItem == EQUIP_SWORD) { + } else if (mEquipItem == 0x103) { swordUnequip(); - } else if (mEquipItem == noentry71) { + } else if (mEquipItem == 0x102) { deleteEquipItem(0, 0); field_0x2060->initOldFrameMorf(5.0f, 0, 35); } else { @@ -13400,7 +13400,7 @@ BOOL daAlink_c::checkItemChangeFromButton() { if (checkModeFlg(4) && !checkEquipAnime() && !checkBoomerangThrowAnime() && !checkCopyRodThrowAnime() && !checkKandelaarSwingAnime() && !checkKandelaarSwingAnime()) { - if (dComIfGs_getSelectEquipSword() != NO_ITEM && !checkNotBattleStage() && + if (dComIfGs_getSelectEquipSword() != fpcNm_ITEM_NONE && !checkNotBattleStage() && !checkCanoeRide() && (!checkModeFlg(0x40000) || checkEquipHeavyBoots()) && mEquipItem != 0x103 && swordTrigger()) { @@ -13423,27 +13423,27 @@ BOOL daAlink_c::checkItemChangeFromButton() { } if (doTrigger() && dComIfGp_getDoStatus() == 4) { - if (mEquipItem != KANTERA && checkNoResetFlg2(FLG2_UNK_1)) { + if (mEquipItem != fpcNm_ITEM_KANTERA && checkNoResetFlg2(FLG2_UNK_1)) { offKandelaarModel(); - } else if (mSwordFlourishTimer != 0 && mEquipItem == EQUIP_SWORD && + } else if (mSwordFlourishTimer != 0 && mEquipItem == 0x103 && !checkWoodSwordEquip() && !checkModeFlg(0x402)) { return procSwordUnequipSpInit(); } else { allUnequip(1); } - } else if (mEquipItem == NO_ITEM && mThrowBoomerangAcKeep.getActor() == NULL && + } else if (mEquipItem == fpcNm_ITEM_NONE && mThrowBoomerangAcKeep.getActor() == NULL && !checkCanoeRide() && checkNoUpperAnime() && checkNoResetFlg2(FLG2_UNK_1)) { for (i = 0; i < 2; i++) { - if (dComIfGp_getSelectItem(i) == KANTERA) { + if (dComIfGp_getSelectItem(i) == fpcNm_ITEM_KANTERA) { mSelectItemId = i; } } - itemEquip(KANTERA); + itemEquip(fpcNm_ITEM_KANTERA); onNoResetFlg1(FLG1_UNK_40); - } else if (mEquipItem != 0x103 && mEquipItem != NO_ITEM && mEquipItem != 0x10B && + } else if (mEquipItem != 0x103 && mEquipItem != fpcNm_ITEM_NONE && mEquipItem != 0x10B && mEquipItem != 0x102 && (!checkCanoeRide() || !checkFisingRodLure())) { if (!checkEventRun() || @@ -13595,7 +13595,7 @@ int daAlink_c::checkNextAction(int param_0) { setSpeedAndAngleAtn(); } else if (((!checkUpperReadyThrowAnime() || mFastShotTime != 0) || (checkBoomerangThrowAnime() && - (mThrowBoomerangAcKeep.getActor() != NULL || mEquipItem == noentry71 || + (mThrowBoomerangAcKeep.getActor() != NULL || mEquipItem == 0x102 || checkNoResetFlg1(FLG1_UNK_2)))) || (checkCopyRodThrowAnime() && (mCopyRodAcKeep.getActor() != NULL || checkNoResetFlg1(FLG1_UNK_10000)))) @@ -13700,11 +13700,11 @@ int daAlink_c::checkNextAction(int param_0) { /* 800BA6A0-800BA914 0B4FE0 0274+00 3/3 0/0 0/0 .text commonChangeItem__9daAlink_cFv */ void daAlink_c::commonChangeItem() { - if (mEquipItem == KANTERA && field_0x2fde == 0xFF && (mProcID != PROC_PREACTION_UNEQUIP || mProcVar4.field_0x3010 != 0)) { + if (mEquipItem == fpcNm_ITEM_KANTERA && field_0x2fde == 0xFF && (mProcID != PROC_PREACTION_UNEQUIP || mProcVar4.field_0x3010 != 0)) { offKandelaarModel(); } - if ((mEquipItem == NO_ITEM && field_0x2fde != 0x103) || (mEquipItem == 0x103 && field_0x2fde != 0xFF)) { + if ((mEquipItem == fpcNm_ITEM_NONE && field_0x2fde != 0x103) || (mEquipItem == 0x103 && field_0x2fde != 0xFF)) { seStartOnlyReverb(Z2SE_AL_ITEM_TAKEOUT); } @@ -13722,7 +13722,7 @@ void daAlink_c::commonChangeItem() { } BOOL var_r30; - if (mEquipItem != NO_ITEM) { + if (mEquipItem != fpcNm_ITEM_NONE) { var_r30 = true; deleteEquipItem(TRUE, FALSE); } else { @@ -13730,7 +13730,7 @@ void daAlink_c::commonChangeItem() { } mEquipItem = field_0x2fde; - field_0x2fde = NO_ITEM; + field_0x2fde = fpcNm_ITEM_NONE; if (checkReinRide()) { field_0x2060->initOldFrameMorf(3.0f, 0, 0x23); @@ -13757,7 +13757,7 @@ void daAlink_c::commonChangeItem() { /* 800BA914-800BAF08 0B5254 05F4+00 1/1 0/0 0/0 .text setItemAction__9daAlink_cFv */ void daAlink_c::setItemAction() { - if (mEquipItem == IRONBALL) { + if (mEquipItem == fpcNm_ITEM_IRONBALL) { checkIronBallDelete(); } @@ -14789,13 +14789,13 @@ void daAlink_c::setLastSceneMode(u32* o_mode) { *o_mode |= 0x800000; } - if (checkNoResetFlg2(FLG2_UNK_1) && mEquipItem != KANTERA) { + if (checkNoResetFlg2(FLG2_UNK_1) && mEquipItem != fpcNm_ITEM_KANTERA) { *o_mode |= 0x200000; } - if (mEquipItem == EQUIP_SWORD) { + if (mEquipItem == 0x103) { *o_mode |= 0x28000000; - } else if (mEquipItem < NO_ITEM) { + } else if (mEquipItem < fpcNm_ITEM_NONE) { *o_mode |= mEquipItem << 0x18; } @@ -15318,7 +15318,7 @@ BOOL daAlink_c::checkSightLine(f32 param_0, cXyz* param_1) { cXyz sp3C; cXyz sp30(mHeldItemRootPos); - if (checkHookshotItem(mEquipItem) || mEquipItem == PACHINKO) { + if (checkHookshotItem(mEquipItem) || mEquipItem == fpcNm_ITEM_PACHINKO) { var_r29 = &sp30; } else if (checkBowItem(mEquipItem) && mItemAcKeep.getActor() != NULL) { var_r29 = &mItemAcKeep.getActor()->current.pos; @@ -15344,12 +15344,12 @@ BOOL daAlink_c::checkSightLine(f32 param_0, cXyz* param_1) { } sp30 -= sp3C * 100.0f; - } else if (mEquipItem == COPY_ROD) { + } else if (mEquipItem == fpcNm_ITEM_COPY_ROD) { return 0; } dBgS_LinChk* var_r30; - if (mEquipItem == BOOMERANG) { + if (mEquipItem == fpcNm_ITEM_BOOMERANG) { var_r30 = &mBoomerangLinChk; } else if (mProcID == PROC_HAWK_SUBJECT) { var_r30 = &mLinkLinChk; @@ -15396,7 +15396,7 @@ void daAlink_c::keepItemData() { void daAlink_c::returnKeepItemData() { deleteEquipItem(FALSE, FALSE); mEquipItem = mKeepItem; - mKeepItem = NO_ITEM; + mKeepItem = fpcNm_ITEM_NONE; makeItemType(); } @@ -15407,22 +15407,22 @@ BOOL daAlink_c::setItemModel() { return 1; } - if (mEquipItem == PACHINKO) { + if (mEquipItem == fpcNm_ITEM_PACHINKO) { setSlingModel(); return 1; } - if (mEquipItem == COPY_ROD) { + if (mEquipItem == fpcNm_ITEM_COPY_ROD) { setCopyRodModel(); return mCopyRodAcKeep.getActor() != NULL ? 1 : 0; } - if (mEquipItem == KANTERA) { + if (mEquipItem == fpcNm_ITEM_KANTERA) { setKandelaarModel(); return 1; } - if (mEquipItem == EMPTY_BOTTLE) { + if (mEquipItem == fpcNm_ITEM_EMPTY_BOTTLE) { setBottleModel(mEquipItem); return 1; } @@ -15432,12 +15432,12 @@ BOOL daAlink_c::setItemModel() { return 1; } - if (mEquipItem == EQUIP_SWORD) { + if (mEquipItem == 0x103) { setSwordModel(); return 1; } - if (mEquipItem == IRONBALL) { + if (mEquipItem == fpcNm_ITEM_IRONBALL) { setIronBallModel(); setIronBallWaitUpperAnime(1); return mItemAcKeep.getActor() != NULL ? 1 : 0; @@ -15448,7 +15448,7 @@ BOOL daAlink_c::setItemModel() { /* 800BF9F0-800BFD74 0BA330 0384+00 4/4 0/0 0/0 .text setItemActor__9daAlink_cFv */ BOOL daAlink_c::setItemActor() { - if (mEquipItem == BOOMERANG) { + if (mEquipItem == fpcNm_ITEM_BOOMERANG) { fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_fastCreate(PROC_BOOMERANG, 0, ¤t.pos, -1, NULL, NULL, -1, NULL, NULL); if (actor == NULL) { @@ -15461,7 +15461,7 @@ BOOL daAlink_c::setItemActor() { return 1; } - if (mEquipItem == COPY_ROD) { + if (mEquipItem == fpcNm_ITEM_COPY_ROD) { fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_fastCreate(PROC_CROD, 0, ¤t.pos, -1, NULL, NULL, -1, NULL, NULL); if (actor == NULL) { @@ -15474,7 +15474,7 @@ BOOL daAlink_c::setItemActor() { return 1; } - if (mEquipItem == IRONBALL) { + if (mEquipItem == fpcNm_ITEM_IRONBALL) { fopAc_ac_c* actor = daCrod_c::makeIronBallDummy(this); if (actor == NULL) { @@ -15507,7 +15507,7 @@ BOOL daAlink_c::setItemActor() { if (!dComIfGp_getHorseActor()->checkNoBombProc() && (mProcID != PROC_HORSE_TURN || !checkModeFlg(MODE_DISABLE_ITEMS))) { - mEquipItem = NO_ITEM; + mEquipItem = fpcNm_ITEM_NONE; return 1; } } @@ -15515,7 +15515,7 @@ BOOL daAlink_c::setItemActor() { cXyz create_pos = (mLeftHandPos + mRightHandPos) * 0.5f; if (checkReadyItem()) { fopAc_ac_c* actor; - if (mEquipItem == NORMAL_BOMB) { + if (mEquipItem == fpcNm_ITEM_NORMAL_BOMB) { actor = dBomb_c::createNormalBombPlayer(&create_pos); } else { actor = dBomb_c::createWaterBombPlayer(&create_pos); @@ -15529,7 +15529,7 @@ BOOL daAlink_c::setItemActor() { setGrabUpperAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); } } - mEquipItem = NO_ITEM; + mEquipItem = fpcNm_ITEM_NONE; return 1; } @@ -15544,11 +15544,11 @@ void daAlink_c::makeItemType() { } bool daPy_py_c::checkZoraWearFlg() const { - return dComIfGs_getSelectEquipClothes() == WEAR_ZORA; + return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_WEAR_ZORA; } bool daPy_py_c::checkMagicArmorWearFlg() const { - return dComIfGs_getSelectEquipClothes() == ARMOR; + return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_ARMOR; } /* 800BFDB0-800BFDFC 0BA6F0 004C+00 28/28 0/0 0/0 .text checkZoraWearAbility__9daAlink_cCFv */ @@ -15655,7 +15655,7 @@ int daAlink_c::checkGroupItem(int i_itemNo, int i_selItem) const { int daAlink_c::checkSetItemTrigger(int i_itemNo) { for (u8 i = 0; i < 2; i++) { if (checkGroupItem(i_itemNo, dComIfGp_getSelectItem(i)) && itemTriggerCheck(1 << i)) { - if (i_itemNo != HVY_BOOTS) { + if (i_itemNo != fpcNm_ITEM_HVY_BOOTS) { mSelectItemId = i; } return 1; @@ -15747,12 +15747,12 @@ bool daAlink_c::checkNotAutoJumpStage() { /* 800C0678-800C077C 0BAFB8 0104+00 3/3 0/0 0/0 .text checkCastleTownUseItem__9daAlink_cFUs */ bool daAlink_c::checkCastleTownUseItem(u16 i_itemNo) { if (checkNotBattleStage()) { - if (i_itemNo == KANTERA || checkTradeItem(i_itemNo) || - (i_itemNo == DUNGEON_BACK && checkLv7DungeonShop()) || - (checkRoomSpecial() && (i_itemNo == EMPTY_BOTTLE || checkDungeonWarpItem(i_itemNo))) || - (checkStageName("R_SP128") && i_itemNo == COPY_ROD) || - (checkLv2DungeonRoomSpecial() && i_itemNo == HVY_BOOTS) || - (checkBottleItem(i_itemNo) && i_itemNo != EMPTY_BOTTLE)) + if (i_itemNo == fpcNm_ITEM_KANTERA || checkTradeItem(i_itemNo) || + (i_itemNo == fpcNm_ITEM_DUNGEON_BACK && checkLv7DungeonShop()) || + (checkRoomSpecial() && (i_itemNo == fpcNm_ITEM_EMPTY_BOTTLE || checkDungeonWarpItem(i_itemNo))) || + (checkStageName("R_SP128") && i_itemNo == fpcNm_ITEM_COPY_ROD) || + (checkLv2DungeonRoomSpecial() && i_itemNo == fpcNm_ITEM_HVY_BOOTS) || + (checkBottleItem(i_itemNo) && i_itemNo != fpcNm_ITEM_EMPTY_BOTTLE)) { return true; } else { @@ -15829,13 +15829,13 @@ int daAlink_c::changeItemTriggerKeepProc(u8 i_selItemIdx, int i_procType) { } else if (i_procType == ITEM_PROC_OFF_KANDELAAR) { offKandelaarModel(); } else if (i_procType == ITEM_PROC_COMMON_CHANGE_ITEM) { - field_0x2fde = NO_ITEM; + field_0x2fde = fpcNm_ITEM_NONE; itemEquip(sel_item); if (dComIfGp_checkPlayerStatus0(0, 0x2000) && ((checkBowAndSlingItem(field_0x2fde) || checkHookshotItem(field_0x2fde) || - field_0x2fde == COPY_ROD) || - field_0x2fde == BOOMERANG)) + field_0x2fde == fpcNm_ITEM_COPY_ROD) || + field_0x2fde == fpcNm_ITEM_BOOMERANG)) { commonChangeItem(); resetUpperAnime(UPPER_2, -1.0f); @@ -15857,35 +15857,35 @@ int daAlink_c::changeItemTriggerKeepProc(u8 i_selItemIdx, int i_procType) { int daAlink_c::checkNewItemChange(u8 param_0) { u32 sel_item = dComIfGp_getSelectItem(param_0); - if (checkSpinnerRide() || sel_item == BOMB_BAG_LV1 || - ((sel_item == KANTERA || checkOilBottleItem(sel_item)) && + if (checkSpinnerRide() || sel_item == fpcNm_ITEM_BOMB_BAG_LV1 || + ((sel_item == fpcNm_ITEM_KANTERA || checkOilBottleItem(sel_item)) && checkWaterInKandelaarOffset(mWaterY)) || (checkCanoeRide() && checkStageName("F_SP127")) || checkCloudSea() || ((checkModeFlg(0x40000) || checkNoResetFlg0(FLG0_UNDERWATER)) && !checkAcceptUseItemInWater(sel_item)) || - (checkModeFlg(0x40000) && sel_item == WATER_BOMB) || !checkCastleTownUseItem(sel_item) || + (checkModeFlg(0x40000) && sel_item == fpcNm_ITEM_WATER_BOMB) || !checkCastleTownUseItem(sel_item) || (checkBoardRide() && sel_item != 0x103) || (checkModeFlg(0x400) && - (sel_item == EMPTY_BOTTLE || sel_item == POKE_BOMB || sel_item == IRONBALL || - sel_item == COPY_ROD || checkFishingRodItem(sel_item))) || + (sel_item == fpcNm_ITEM_EMPTY_BOTTLE || sel_item == fpcNm_ITEM_POKE_BOMB || sel_item == fpcNm_ITEM_IRONBALL || + sel_item == fpcNm_ITEM_COPY_ROD || checkFishingRodItem(sel_item))) || ((mGndPolySpecialCode == dBgW_SPCODE_HEAVY_SNOW || field_0x2fbd == 1 || field_0x2fbd == 2 || mWaterY - current.pos.y > 45.0f || (field_0x2fbc == 6 && mWaterY - current.pos.y >= 0.0f) || field_0x2fbd == 3) && - sel_item == SPINNER) || + sel_item == fpcNm_ITEM_SPINNER) || (checkBossRoom() && checkDungeonWarpItem(sel_item)) || - (sel_item == DUNGEON_EXIT && + (sel_item == fpcNm_ITEM_DUNGEON_EXIT && (checkLv7DungeonShop() || (checkStageName("D_MN07") && fopAcM_isSwitch(this, 0x4D) && !fopAcM_isSwitch(this, 0x18)) || (checkStageName("D_MN10") && fopAcM_GetRoomNo(this) == 15))) || (checkMagneBootsOn() && sel_item != 0x103 && !checkDrinkBottleItem(sel_item) && - sel_item != HVY_BOOTS && !checkBowItem(sel_item))) + sel_item != fpcNm_ITEM_HVY_BOOTS && !checkBowItem(sel_item))) { return ITEM_PROC_NONE; - } else if (sel_item == HVY_BOOTS || checkDungeonWarpItem(sel_item) || + } else if (sel_item == fpcNm_ITEM_HVY_BOOTS || checkDungeonWarpItem(sel_item) || checkTradeItem(sel_item) || - (checkBottleItem(sel_item) && sel_item != EMPTY_BOTTLE) || sel_item == SPINNER || - sel_item == POKE_BOMB || sel_item == HORSE_FLUTE || sel_item == HAWK_EYE) + (checkBottleItem(sel_item) && sel_item != fpcNm_ITEM_EMPTY_BOTTLE) || sel_item == fpcNm_ITEM_SPINNER || + sel_item == fpcNm_ITEM_POKE_BOMB || sel_item == fpcNm_ITEM_HORSE_FLUTE || sel_item == fpcNm_ITEM_HAWK_EYE) { if (checkReinRide() || checkCanoeRide()) { if (checkDrinkBottleItem(sel_item)) { @@ -15895,7 +15895,7 @@ int daAlink_c::checkNewItemChange(u8 param_0) { if (checkOilBottleItem(sel_item) && checkItemSetButton(0x48) != 2) { return ITEM_PROC_KANDELAAR_POUR; } - } else if (sel_item == HVY_BOOTS) { + } else if (sel_item == fpcNm_ITEM_HVY_BOOTS) { if (!checkBoardRide()) { if ((mLinkAcch.ChkGroundHit() && !checkModeFlg(0x70C52)) || (checkMagneBootsOn() && cBgW_CheckBGround(mMagneBootsTopVec.y)) || @@ -15911,7 +15911,7 @@ int daAlink_c::checkNewItemChange(u8 param_0) { } } else if (mLinkAcch.ChkGroundHit()) { if (!checkModeFlg(0x70C52)) { - if (sel_item == SPINNER) { + if (sel_item == fpcNm_ITEM_SPINNER) { cXyz sp38(current.pos.x, current.pos.y + l_autoUpHeight, current.pos.z); cXyz sp2C(sp38); cXyz sp20; @@ -15938,17 +15938,17 @@ int daAlink_c::checkNewItemChange(u8 param_0) { } else if (checkDungeonWarpItem(sel_item)) { return ITEM_PROC_DUNGEON_WARP_READY; } else if (checkItemSetButton(0x108) != 2 && - (sel_item == WORM || sel_item == BEE_CHILD)) + (sel_item == fpcNm_ITEM_WORM || sel_item == fpcNm_ITEM_BEE_CHILD)) { int temp_r3_8 = dComIfGp_getSelectItem(checkItemSetButton(0x108)); - if (temp_r3_8 == WORM_ROD || temp_r3_8 == JEWEL_WORM_ROD) { - if (sel_item == BEE_CHILD) { + if (temp_r3_8 == fpcNm_ITEM_WORM_ROD || temp_r3_8 == fpcNm_ITEM_JEWEL_WORM_ROD) { + if (sel_item == fpcNm_ITEM_BEE_CHILD) { return ITEM_PROC_BOTTLE_DRINK; } return ITEM_PROC_NONE; } - if (sel_item == BEE_CHILD && - (temp_r3_8 == BEE_ROD || temp_r3_8 == JEWEL_BEE_ROD)) + if (sel_item == fpcNm_ITEM_BEE_CHILD && + (temp_r3_8 == fpcNm_ITEM_BEE_ROD || temp_r3_8 == fpcNm_ITEM_JEWEL_BEE_ROD)) { return ITEM_PROC_BOTTLE_DRINK; } @@ -15959,26 +15959,26 @@ int daAlink_c::checkNewItemChange(u8 param_0) { return ITEM_PROC_BOTTLE_OPEN; } else if (checkTradeItem(sel_item)) { return ITEM_PROC_NOT_USE_ITEM; - } else if (sel_item == HORSE_FLUTE) { + } else if (sel_item == fpcNm_ITEM_HORSE_FLUTE) { return ITEM_PROC_GRASS_WHISTLE; } else if (checkOilBottleItem(sel_item) && checkItemSetButton(0x48) != 2) { return ITEM_PROC_KANDELAAR_POUR; - } else if (sel_item == HAWK_EYE) { + } else if (sel_item == fpcNm_ITEM_HAWK_EYE) { if (acceptSubjectModeChange()) { return ITEM_PROC_SUBJECTIVITY; } - } else if (sel_item == POKE_BOMB && dComIfGp_getSelectItemNum(param_0) && + } else if (sel_item == fpcNm_ITEM_POKE_BOMB && dComIfGp_getSelectItemNum(param_0) && field_0x2fcf < 2) { return ITEM_PROC_PICK_PUT; } } } - } else if (sel_item != NO_ITEM && mEquipItem != sel_item) { + } else if (sel_item != fpcNm_ITEM_NONE && mEquipItem != sel_item) { if ((checkBombItem(sel_item) && !dComIfGp_getSelectItemNum(param_0)) || - ((sel_item == NORMAL_BOMB || sel_item == WATER_BOMB) && mActiveBombNum >= 3) || - (sel_item == IRONBALL && (!mLinkAcch.ChkGroundHit() || checkModeFlg(0x70C52))) || - (sel_item == KANTERA && (checkNoResetFlg0(FLG0_UNDERWATER) || + ((sel_item == fpcNm_ITEM_NORMAL_BOMB || sel_item == fpcNm_ITEM_WATER_BOMB) && mActiveBombNum >= 3) || + (sel_item == fpcNm_ITEM_IRONBALL && (!mLinkAcch.ChkGroundHit() || checkModeFlg(0x70C52))) || + (sel_item == fpcNm_ITEM_KANTERA && (checkNoResetFlg0(FLG0_UNDERWATER) || checkEndResetFlg1(ERFLG1_UNK_4) || checkModeFlg(0x40000)))) { return ITEM_PROC_NONE; @@ -15986,7 +15986,7 @@ int daAlink_c::checkNewItemChange(u8 param_0) { return ITEM_PROC_COMMON_CHANGE_ITEM; } - if (mEquipItem == sel_item && mSelectItemId != param_0 && mEquipItem == EMPTY_BOTTLE) { + if (mEquipItem == sel_item && mSelectItemId != param_0 && mEquipItem == fpcNm_ITEM_EMPTY_BOTTLE) { return ITEM_PROC_BOTTLE_SWING; } @@ -15997,11 +15997,11 @@ int daAlink_c::checkNewItemChange(u8 param_0) { void daAlink_c::deleteEquipItem(BOOL i_playSound, BOOL i_deleteKantera) { if (i_deleteKantera || mProcID == PROC_UNEQUIP) { offKandelaarModel(); - } else if (mEquipItem == KANTERA && checkNoResetFlg2(FLG2_UNK_1)) { + } else if (mEquipItem == fpcNm_ITEM_KANTERA && checkNoResetFlg2(FLG2_UNK_1)) { mZ2Link.setKanteraState(2); } - if (mEquipItem == NO_ITEM || mEquipItem == 0x10B) { + if (mEquipItem == fpcNm_ITEM_NONE || mEquipItem == 0x10B) { return; } @@ -16014,7 +16014,7 @@ void daAlink_c::deleteEquipItem(BOOL i_playSound, BOOL i_deleteKantera) { } else { seStartOnlyReverb(Z2SE_AL_SWORD_PUTIN); } - } else if (mEquipItem < NO_ITEM) { + } else if (mEquipItem < fpcNm_ITEM_NONE) { seStartOnlyReverb(Z2SE_AL_ITEM_TAKEOUT); } } @@ -16037,16 +16037,16 @@ void daAlink_c::deleteEquipItem(BOOL i_playSound, BOOL i_deleteKantera) { fopAcM_delete(item_actor); } - if (mEquipItem == IRONBALL) { + if (mEquipItem == fpcNm_ITEM_IRONBALL) { mZ2Link.setUsingIronBall(false); } else if (checkHookshotItem(mEquipItem)) { cancelHookshotCarry(); } - if (((mEquipItem == BOOMERANG || mEquipItem == 0x102) && checkBoomerangAnime()) || - (mEquipItem == COPY_ROD && checkCopyRodAnime()) || + if (((mEquipItem == fpcNm_ITEM_BOOMERANG || mEquipItem == 0x102) && checkBoomerangAnime()) || + (mEquipItem == fpcNm_ITEM_COPY_ROD && checkCopyRodAnime()) || (checkHookshotItem(mEquipItem) && checkHookshotAnime()) || - (mEquipItem == IRONBALL && (checkIronBallAnime() || checkIronBallWaitAnime())) || + (mEquipItem == fpcNm_ITEM_IRONBALL && (checkIronBallAnime() || checkIronBallWaitAnime())) || (checkBowAndSlingItem(mEquipItem) && checkBowAnime())) { resetUpperAnime(UPPER_2, -1.0f); @@ -16057,7 +16057,7 @@ void daAlink_c::deleteEquipItem(BOOL i_playSound, BOOL i_deleteKantera) { } mItemAcKeep.clearData(); - mEquipItem = NO_ITEM; + mEquipItem = fpcNm_ITEM_NONE; mHeldItemModel = NULL; mpHookTipModel = NULL; field_0x0710 = NULL; @@ -16571,7 +16571,7 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { } if (checkBombItem(mEquipItem)) { - mEquipItem = NO_ITEM; + mEquipItem = fpcNm_ITEM_NONE; } } @@ -16608,7 +16608,7 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { dComIfGp_clearPlayerStatus1(0, 0x7fb7b78); cancelHookshotShot(); - if (mEquipItem == noentry77) { + if (mEquipItem == 0x109) { deleteEquipItem(FALSE, FALSE); } diff --git a/src/d/actor/d_a_alink_boom.inc b/src/d/actor/d_a_alink_boom.inc index 0c2312377b..a896076cce 100644 --- a/src/d/actor/d_a_alink_boom.inc +++ b/src/d/actor/d_a_alink_boom.inc @@ -84,7 +84,7 @@ fopAc_ac_c* daAlink_c::getBoomerangActor() { return mThrowBoomerangAcKeep.getActor(); } - if (mEquipItem == BOOMERANG) { + if (mEquipItem == fpcNm_ITEM_BOOMERANG) { return mItemAcKeep.getActor(); } @@ -147,7 +147,7 @@ BOOL daAlink_c::checkBoomerangAnime() const { /* 800E04AC-800E04E8 0DADEC 003C+00 13/13 0/0 0/0 .text checkBoomerangThrowAnime__9daAlink_cCFv */ BOOL daAlink_c::checkBoomerangThrowAnime() const { - return (mEquipItem == BOOMERANG || checkNoResetFlg1(FLG1_UNK_2) || mEquipItem == noentry71) && + return (mEquipItem == fpcNm_ITEM_BOOMERANG || checkNoResetFlg1(FLG1_UNK_2) || mEquipItem == 0x102) && checkUpperAnime(0x53); } @@ -185,7 +185,7 @@ void daAlink_c::setBoomerangCatchAnime() { setFacePriBck(0xE8); field_0x2f97 = 254; - if (mEquipItem != COPY_ROD) { + if (mEquipItem != fpcNm_ITEM_COPY_ROD) { seStartOnlyReverb(JA_SE_LK_BOOM_CATCH); } } @@ -220,13 +220,13 @@ void daAlink_c::throwBoomerang() { fopAcM_cancelCarryNow(item); item = NULL; - mEquipItem = NO_ITEM; + mEquipItem = fpcNm_ITEM_NONE; field_0x2f94 = 0xFF; field_0x2f96 = 0xFE; } mItemAcKeep.clearData(); - mEquipItem = NO_ITEM; + mEquipItem = fpcNm_ITEM_NONE; field_0x2f94 = 0xFF; field_0x2f96 = 0xFE; @@ -259,7 +259,7 @@ void daAlink_c::throwBoomerang() { int daAlink_c::returnBoomerang(int param_0) { dComIfGp_clearPlayerStatus0(0, 0x400000); - if (mEquipItem == NO_ITEM && !checkMagneBootsOn() && mItemAcKeep.getActor() == NULL && + if (mEquipItem == fpcNm_ITEM_NONE && !checkMagneBootsOn() && mItemAcKeep.getActor() == NULL && !checkBoardRide() && !checkBoarRide() && !checkWolf() && (mProcID != PROC_HANG_READY || field_0x3198 != 3) && (!checkEventRun() || param_0 != 0) && (checkNoUpperAnime() || checkPlayerGuard() || checkHorseTurnAnime() || @@ -268,7 +268,7 @@ int daAlink_c::returnBoomerang(int param_0) { mItemAcKeep = mThrowBoomerangAcKeep; mThrowBoomerangAcKeep.clearData(); - mEquipItem = BOOMERANG; + mEquipItem = fpcNm_ITEM_BOOMERANG; field_0x2f94 = 2; onNoResetFlg0(FLG0_UNK_20); diff --git a/src/d/actor/d_a_alink_bottle.inc b/src/d/actor/d_a_alink_bottle.inc index 11ed011536..da5d305187 100644 --- a/src/d/actor/d_a_alink_bottle.inc +++ b/src/d/actor/d_a_alink_bottle.inc @@ -64,21 +64,21 @@ void daAlink_c::setBottleModel(u16 i_itemNo) { field_0x0718 = loadAramItemBtk(0x32B, mHeldItemModel); - if (i_itemNo == FAIRY) { + if (i_itemNo == fpcNm_ITEM_FAIRY) { J3DAnmTransform* bck = (J3DAnmTransform*)loadAram(0x1E8, 0xC00); mpHookTipModel = initModel(loadAramBmd(0x31D, 0x1400), 0); if (!mHookTipBck.init(bck, FALSE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false)) { JUT_ASSERT(142, 0); } mHookTipBck.entry(mpHookTipModel->getModelData(), 0.0f); - } else if (i_itemNo == WORM) { + } else if (i_itemNo == fpcNm_ITEM_WORM) { J3DAnmTransform* bck = (J3DAnmTransform*)loadAram(0x1E9, 0xC00); mpHookTipModel = initModel(loadAramBmd(0x31E, 0x2400), 0); if (!mHookTipBck.init(bck, FALSE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false)) { JUT_ASSERT(151, 0); } mHookTipBck.entry(mpHookTipModel->getModelData(), 0.0f); - } else if (i_itemNo == BEE_CHILD) { + } else if (i_itemNo == fpcNm_ITEM_BEE_CHILD) { mpHookTipModel = initModel(loadAramBmd(0x31C, 0x1000), 0); } @@ -97,40 +97,40 @@ void daAlink_c::setBottleModel(u16 i_itemNo) { mItemMode = 0; } - if ((checkDrinkBottleItem(i_itemNo) && i_itemNo != BEE_CHILD) || checkOilBottleItem(i_itemNo)) { + if ((checkDrinkBottleItem(i_itemNo) && i_itemNo != fpcNm_ITEM_BEE_CHILD) || checkOilBottleItem(i_itemNo)) { item_model_data->getMaterialNodePointer(0)->getShape()->hide(); - if (i_itemNo == RED_BOTTLE || i_itemNo == CHUCHU_RED || i_itemNo == RED_BOTTLE_2) { + if (i_itemNo == fpcNm_ITEM_RED_BOTTLE || i_itemNo == fpcNm_ITEM_CHUCHU_RED || i_itemNo == fpcNm_ITEM_RED_BOTTLE_2) { field_0x0724->setFrame(0.0f); - } else if (i_itemNo == GREEN_BOTTLE || i_itemNo == CHUCHU_GREEN) { + } else if (i_itemNo == fpcNm_ITEM_GREEN_BOTTLE || i_itemNo == fpcNm_ITEM_CHUCHU_GREEN) { field_0x0724->setFrame(1.0f); - } else if (i_itemNo == BLUE_BOTTLE || i_itemNo == CHUCHU_BLUE) { + } else if (i_itemNo == fpcNm_ITEM_BLUE_BOTTLE || i_itemNo == fpcNm_ITEM_CHUCHU_BLUE) { field_0x0724->setFrame(2.0f); } else if (checkOilBottleItem(i_itemNo)) { field_0x0724->setFrame(4.0f); - } else if (i_itemNo == HOT_SPRING) { + } else if (i_itemNo == fpcNm_ITEM_HOT_SPRING) { field_0x0724->setFrame(5.0f); - } else if (i_itemNo == CHUCHU_PURPLE) { + } else if (i_itemNo == fpcNm_ITEM_CHUCHU_PURPLE) { field_0x0724->setFrame(6.0f); - } else if (i_itemNo == CHUCHU_RARE) { + } else if (i_itemNo == fpcNm_ITEM_CHUCHU_RARE) { field_0x0724->setFrame(7.0f); - } else if (i_itemNo == UGLY_SOUP || i_itemNo == CHUCHU_BLACK) { + } else if (i_itemNo == fpcNm_ITEM_UGLY_SOUP || i_itemNo == fpcNm_ITEM_CHUCHU_BLACK) { field_0x0724->setFrame(8.0f); - } else if (i_itemNo == LV1_SOUP) { + } else if (i_itemNo == fpcNm_ITEM_LV1_SOUP) { field_0x0724->setFrame(9.0f); - } else if (i_itemNo == LV2_SOUP || i_itemNo == LV3_SOUP) { + } else if (i_itemNo == fpcNm_ITEM_LV2_SOUP || i_itemNo == fpcNm_ITEM_LV3_SOUP) { field_0x0724->setFrame(10.0f); - } else if (i_itemNo == FAIRY_DROP) { + } else if (i_itemNo == fpcNm_ITEM_FAIRY_DROP) { field_0x0724->setFrame(11.0f); } else { field_0x0724->setFrame(3.0f); - if (i_itemNo == HALF_MILK_BOTTLE) { + if (i_itemNo == fpcNm_ITEM_HALF_MILK_BOTTLE) { field_0x072c->setFrame(1.0f); } } } else if (checkOpenBottleItem(i_itemNo)) { - if (i_itemNo == WATER_BOTTLE) { + if (i_itemNo == fpcNm_ITEM_WATER_BOTTLE) { field_0x0724->setFrame(5.0f); } else { field_0x072c->setFrame(2.0f); @@ -170,29 +170,29 @@ int daAlink_c::commonBottleDrink(int param_0) { mItemVar0.mBottleItemHealAmount = 0; - if (mEquipItem != UGLY_SOUP && mEquipItem != CHUCHU_BLACK && - mEquipItem != CHUCHU_PURPLE) + if (mEquipItem != fpcNm_ITEM_UGLY_SOUP && mEquipItem != fpcNm_ITEM_CHUCHU_BLACK && + mEquipItem != fpcNm_ITEM_CHUCHU_PURPLE) { - if (mEquipItem == LV1_SOUP) { + if (mEquipItem == fpcNm_ITEM_LV1_SOUP) { dComIfGp_setItemLifeCount(8, 0); - } else if (mEquipItem == LV2_SOUP) { + } else if (mEquipItem == fpcNm_ITEM_LV2_SOUP) { dComIfGp_setItemLifeCount(16, 0); - } else if (mEquipItem == LV3_SOUP) { + } else if (mEquipItem == fpcNm_ITEM_LV3_SOUP) { dComIfGp_setItemLifeCount(32, 0); - } else if (mEquipItem == BEE_CHILD) { + } else if (mEquipItem == fpcNm_ITEM_BEE_CHILD) { field_0x2fd3 = 3; dComIfGp_setItemLifeCount(dComIfGp_getSelectItemNum(mSelectItemId), 0); - } else if (mEquipItem == RED_BOTTLE || mEquipItem == CHUCHU_RED || - mEquipItem == RED_BOTTLE_2) + } else if (mEquipItem == fpcNm_ITEM_RED_BOTTLE || mEquipItem == fpcNm_ITEM_CHUCHU_RED || + mEquipItem == fpcNm_ITEM_RED_BOTTLE_2) { dComIfGp_setItemLifeCount(32, 0); - } else if (mEquipItem == MILK_BOTTLE || mEquipItem == HALF_MILK_BOTTLE) { + } else if (mEquipItem == fpcNm_ITEM_MILK_BOTTLE || mEquipItem == fpcNm_ITEM_HALF_MILK_BOTTLE) { dComIfGp_setItemLifeCount(12, 0); - } else if (mEquipItem == BLUE_BOTTLE || mEquipItem == CHUCHU_BLUE || - mEquipItem == HOT_SPRING) + } else if (mEquipItem == fpcNm_ITEM_BLUE_BOTTLE || mEquipItem == fpcNm_ITEM_CHUCHU_BLUE || + mEquipItem == fpcNm_ITEM_HOT_SPRING) { dComIfGp_setItemLifeCount(dComIfGs_getMaxLifeGauge(), 0); - } else if (mEquipItem == CHUCHU_RARE || mEquipItem == FAIRY_DROP) { + } else if (mEquipItem == fpcNm_ITEM_CHUCHU_RARE || mEquipItem == fpcNm_ITEM_FAIRY_DROP) { dComIfGp_setItemLifeCount(dComIfGs_getMaxLifeGauge(), 0); } } @@ -205,7 +205,7 @@ int daAlink_c::commonBottleDrink(int param_0) { if (dComIfGp_getItemNowLife() == dComIfGs_getLife()) { mpHookTipModel = NULL; - if (mEquipItem == MILK_BOTTLE) { + if (mEquipItem == fpcNm_ITEM_MILK_BOTTLE) { if (param_0) { setUpperAnimeParam(getMainBckData(ANM_BOTTLE_DRINK_END)->m_upperID, UPPER_2, &daAlinkHIO_bottle_c0::m.mEndDrinkAnm); @@ -217,13 +217,13 @@ int daAlink_c::commonBottleDrink(int param_0) { field_0x072c->setFrame(1.0f); if (mDemo.getDemoType() == 5) { - dComIfGs_setEquipBottleItemIn(mSelectItemId, HALF_MILK_BOTTLE); + dComIfGs_setEquipBottleItemIn(mSelectItemId, fpcNm_ITEM_HALF_MILK_BOTTLE); } } else if (mProcVar2.field_0x300c == 0) { mProcVar2.field_0x300c = 1; mHeldItemModel->getModelData()->entryTexMtxAnimator(field_0x0720); } else if (simpleAnmPlay(field_0x0720)) { - if (mEquipItem == UGLY_SOUP) { + if (mEquipItem == fpcNm_ITEM_UGLY_SOUP) { if (dComIfGs_getLife() <= 2) { mItemVar0.mBottleItemHealAmount = dComIfGs_getMaxLifeGauge(); } else if (dComIfGs_getLife() <= 4) { @@ -236,7 +236,7 @@ int daAlink_c::commonBottleDrink(int param_0) { } else { mItemVar0.mBottleItemHealAmount = 4; } - } else if (mEquipItem == CHUCHU_PURPLE) { + } else if (mEquipItem == fpcNm_ITEM_CHUCHU_PURPLE) { f32 rnd = cM_rndF(6.0f); if (rnd < 1.0f) { @@ -251,11 +251,11 @@ int daAlink_c::commonBottleDrink(int param_0) { } else { mItemVar0.mBottleItemHealAmount = 4; } - } else if (mEquipItem == CHUCHU_BLACK) { + } else if (mEquipItem == fpcNm_ITEM_CHUCHU_BLACK) { mItemVar0.mBottleItemHealAmount = -4; } - if (mItemVar0.mBottleItemHealAmount < 0 || mEquipItem == BEE_CHILD) { + if (mItemVar0.mBottleItemHealAmount < 0 || mEquipItem == fpcNm_ITEM_BEE_CHILD) { if (param_0) { setUpperAnimeParam(getMainBckData(ANM_BOTTLE_DRINK_NASTY)->m_upperID, UPPER_2, &daAlinkHIO_bottle_c0::m.mDrinkNastyAnm); @@ -278,7 +278,7 @@ int daAlink_c::commonBottleDrink(int param_0) { dComIfGs_setEquipBottleItemEmpty(mSelectItemId); } - if (mEquipItem == CHUCHU_RARE || mEquipItem == FAIRY_DROP) { + if (mEquipItem == fpcNm_ITEM_CHUCHU_RARE || mEquipItem == fpcNm_ITEM_FAIRY_DROP) { mSwordUpTimer = 510; } } @@ -287,10 +287,10 @@ int daAlink_c::commonBottleDrink(int param_0) { current_anm == getMainBckData(ANM_BOTTLE_DRINK_NASTY)->m_underID) { if (checkAnmEnd(frameCtrl_p)) { - if (mDemo.getDemoMode() == 0x2A) { + if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_42_e) { setSingleAnimeParam(ANM_PICK_UP, &daAlinkHIO_pickUp_c0::m.field_0x14); } else { - allUnequip(mKeepItem == KANTERA); + allUnequip(mKeepItem == fpcNm_ITEM_KANTERA); } } else if (frameCtrl_p->checkPass(11.0f)) { mHeldItemModel->getModelData()->entryTexMtxAnimator(field_0x0718); @@ -321,9 +321,9 @@ int daAlink_c::commonBottleDrink(int param_0) { } else if (frameCtrl_p->checkPass(9.0f)) { returnKeepItemData(); } - } else if (mEquipItem == NO_ITEM || mEquipItem == KANTERA) { + } else if (mEquipItem == fpcNm_ITEM_NONE || mEquipItem == fpcNm_ITEM_KANTERA) { resetUpperAnime(UPPER_2, 3.0f); - if (mEquipItem == NO_ITEM) { + if (mEquipItem == fpcNm_ITEM_NONE) { returnKeepItemData(); } @@ -368,7 +368,7 @@ fopAc_ac_c* daAlink_c::makeFairy(cXyz* i_pos, u32 i_params) { /* 8010F54C-8010F698 109E8C 014C+00 2/2 0/0 0/0 .text procBottleDrinkInit__9daAlink_cFUs */ int daAlink_c::procBottleDrinkInit(u16 i_itemNo) { - if (mDemo.getDemoMode() == 0x2A) { + if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_42_e) { if (mProcID == PROC_BOTTLE_DRINK) { return 1; } @@ -431,12 +431,12 @@ int daAlink_c::procBottleOpenInit(u16 param_0) { field_0x32cc = -1; mProcVar0.field_0x3008 = 1; - if (mEquipItem == FAIRY) { + if (mEquipItem == fpcNm_ITEM_FAIRY) { field_0x3194 = 3; } else { field_0x3194 = 2; - if (mEquipItem == WORM) { + if (mEquipItem == fpcNm_ITEM_WORM) { field_0x32cc = fopAcM_create(PROC_NPC_WORM, 2, ¤t.pos, fopAcM_GetRoomNo(this), NULL, NULL, -1); mProcVar0.field_0x3008 = 0; @@ -478,12 +478,12 @@ int daAlink_c::procBottleOpen() { if (checkUnderMove0BckNoArc(ANM_BOTTLE_OPEN)) { if (checkAnmEnd(frameCtrl_p)) { - if (mEquipItem == FAIRY) { + if (mEquipItem == fpcNm_ITEM_FAIRY) { setSingleAnimeBaseMorf(ANM_BOTTLE_FAIRY, -1.0f); } else { setSingleAnimeParam(ANM_BOTTLE_POUR, &daAlinkHIO_bottle_c0::m.mPourAnm); - if (mEquipItem == WATER_BOTTLE) { + if (mEquipItem == fpcNm_ITEM_WATER_BOTTLE) { if (mWaterY > mLeftHandPos.y) { mProcVar3.field_0x300e = 0; } else { @@ -496,7 +496,7 @@ int daAlink_c::procBottleOpen() { mProcVar2.field_0x300c = 1; mHeldItemModel->getModelData()->entryTexMtxAnimator(field_0x071c); - if (mEquipItem == FAIRY) { + if (mEquipItem == fpcNm_ITEM_FAIRY) { cXyz spC; mDoMtx_multVec(mHeldItemModel->getBaseTRMtx(), &bottleTop, &spC); @@ -518,7 +518,7 @@ int daAlink_c::procBottleOpen() { mProcVar2.field_0x300c = 2; dComIfGs_setEquipBottleItemEmpty(mSelectItemId); - if (mEquipItem == WATER_BOTTLE && mProcVar3.field_0x300e != 0) { + if (mEquipItem == fpcNm_ITEM_WATER_BOTTLE && mProcVar3.field_0x300e != 0) { seStartOnlyReverb(Z2SE_LK_SPRINKLE_WATER); } } else if (frameCtrl_p->getFrame() > 16.0f && frameCtrl_p->getFrame() < 31.0f) { @@ -550,11 +550,11 @@ int daAlink_c::procBottleOpen() { * procBottleSwingInit__9daAlink_cFP10fopAc_ac_ci */ int daAlink_c::procBottleSwingInit(fopAc_ac_c* param_0, int param_1) { fopAc_ac_c* var_r31 = param_0; - if (var_r31 != NULL && mEquipItem != KANTERA) { + if (var_r31 != NULL && mEquipItem != fpcNm_ITEM_KANTERA) { return procPreActionUnequipInit(PROC_BOTTLE_SWING, NULL); } - if (var_r31 == NULL && getReadyItem() != EMPTY_BOTTLE) { + if (var_r31 == NULL && getReadyItem() != fpcNm_ITEM_EMPTY_BOTTLE) { return checkWaitAction(); } @@ -591,11 +591,11 @@ int daAlink_c::procBottleSwingInit(fopAc_ac_c* param_0, int param_1) { } if (temp_r30 == PROC_OBJ_OILTUBO || temp_r30 == PROC_TAG_SSDRINK || - temp_r30 == PROC_TAG_BTLITM || mEquipItem == KANTERA) + temp_r30 == PROC_TAG_BTLITM || mEquipItem == fpcNm_ITEM_KANTERA) { setSingleAnimeParam(ANM_BOTTLE_SCOOP, &daAlinkHIO_bottle_c0::m.mScoopAnm); - if (mEquipItem == KANTERA) { + if (mEquipItem == fpcNm_ITEM_KANTERA) { onNoResetFlg2(FLG2_UNK_10000000); JPABaseEmitter* emitter_p = dComIfGp_particle_getEmitter(field_0x31c4); @@ -659,25 +659,25 @@ int daAlink_c::procBottleSwing() { mProcVar2.field_0x300c = 1; offModeFlg(4); - if (mEquipItem != KANTERA) { + if (mEquipItem != fpcNm_ITEM_KANTERA) { u16 bottle_item = dComIfGp_event_getPreItemNo(); - if (bottle_item == WATER_BOTTLE && + if (bottle_item == fpcNm_ITEM_WATER_BOTTLE && getMoveBGActorName(mLinkAcch.m_wtr, FALSE) == PROC_Obj_Onsen) { - bottle_item = HOT_SPRING; + bottle_item = fpcNm_ITEM_HOT_SPRING; } dComIfGs_setEquipBottleItemIn(mSelectItemId, bottle_item); - if (bottle_item == BEE_CHILD) { + if (bottle_item == fpcNm_ITEM_BEE_CHILD) { dComIfGp_setSelectItemNum(mSelectItemId, dComIfGs_getBottleMax()); - } else if (bottle_item == WATER_BOTTLE) { + } else if (bottle_item == fpcNm_ITEM_WATER_BOTTLE) { seStartOnlyReverb(Z2SE_LK_SCOOP_WATER); } else if (checkOilBottleItem(bottle_item)) { seStartOnlyReverb(Z2SE_AL_SCOOP_OIL); - } else if (bottle_item == LV1_SOUP || bottle_item == LV2_SOUP || - bottle_item == LV3_SOUP) + } else if (bottle_item == fpcNm_ITEM_LV1_SOUP || bottle_item == fpcNm_ITEM_LV2_SOUP || + bottle_item == fpcNm_ITEM_LV3_SOUP) { seStartOnlyReverb(Z2SE_AL_SCOOP_SOUP); } @@ -689,12 +689,12 @@ int daAlink_c::procBottleSwing() { mDemo.setSpecialDemoType(); } } else if (frameCtrl_p->getFrame() <= field_0x347c) { - if (getReadyItem() == EMPTY_BOTTLE && + if (getReadyItem() == fpcNm_ITEM_EMPTY_BOTTLE && (dComIfGp_att_getCatghTarget() != NULL || (field_0x2fbc != 11 && field_0x2fbc != 6 && mWaterY > current.pos.y + 10.0f))) { fopAcM_orderCatchEvent(this, dComIfGp_att_getCatghTarget(), 0, 0); - } else if (mEquipItem == KANTERA) { + } else if (mEquipItem == fpcNm_ITEM_KANTERA) { if (field_0x280c.getActor() != NULL) { fopAcM_orderCatchEvent(this, field_0x280c.getActor(), 0, 0); } @@ -723,14 +723,14 @@ int daAlink_c::procBottleGetInit(int param_0) { commonProcInit(PROC_BOTTLE_GET); int var_r30; - if (mEquipItem == KANTERA) { + if (mEquipItem == fpcNm_ITEM_KANTERA) { setSingleAnime(ANM_BOTTLE_GET, daAlinkHIO_bottle_c0::m.mGetAnm.mSpeed, 40.0f, daAlinkHIO_bottle_c0::m.mGetAnm.mEndFrame, daAlinkHIO_bottle_c0::m.mGetAnm.mInterpolation); field_0x2f93 = 0xFE; if (proc_pickup) { - execItemGet(KANTERA); + execItemGet(fpcNm_ITEM_KANTERA); var_r30 = 0xF8; dComIfGp_setItemOilCount(-dComIfGs_getMaxOil()); } else { @@ -754,26 +754,26 @@ int daAlink_c::procBottleGetInit(int param_0) { field_0x3194 = 0; field_0x32cc = var_r30 + 0x65; - if (mEquipItem == KANTERA) { + if (mEquipItem == fpcNm_ITEM_KANTERA) { field_0x3194 = 12; } - if (mEquipItem == KANTERA) { + if (mEquipItem == fpcNm_ITEM_KANTERA) { resetBasAnime(); } u32 id = fopAcM_GetID(this); dCam_getBody()->StartEventCamera(0x12, id, "Type", 1, &field_0x3194, 0); - if (mEquipItem == FAIRY_DROP || mEquipItem == CHUCHU_RARE || mEquipItem == WORM) { + if (mEquipItem == fpcNm_ITEM_FAIRY_DROP || mEquipItem == fpcNm_ITEM_CHUCHU_RARE || mEquipItem == fpcNm_ITEM_WORM) { setFaceBasicTexture(FTANM_UNK_48); setFaceBasicBck(0x143); - } else if (mEquipItem == UGLY_SOUP) { + } else if (mEquipItem == fpcNm_ITEM_UGLY_SOUP) { setFaceBasicBck(0x146); } // event flag 0x4A40: Ordon Day 1 completed - if (mEquipItem == BEE_CHILD && dComIfGs_isEventBit(0x4A40)) { + if (mEquipItem == fpcNm_ITEM_BEE_CHILD && dComIfGs_isEventBit(0x4A40)) { dComIfGs_onEventBit(0x4C80); // event flag 0x4C80: Collected Bee Larva on Ordon Day 2 } @@ -788,7 +788,7 @@ int daAlink_c::procBottleGet() { if (frameCtrl->checkAnmEnd() && checkEndMessage(field_0x32cc)) { resetFairyEffect(); - if (mEquipItem != KANTERA) { + if (mEquipItem != fpcNm_ITEM_KANTERA) { deleteEquipItem(FALSE, FALSE); } diff --git a/src/d/actor/d_a_alink_bow.inc b/src/d/actor/d_a_alink_bow.inc index 69638d4253..8a12168bc1 100644 --- a/src/d/actor/d_a_alink_bow.inc +++ b/src/d/actor/d_a_alink_bow.inc @@ -11,7 +11,7 @@ /* 800DE64C-800DE740 0D8F8C 00F4+00 1/1 0/0 2/2 .text getArrowFlyData__9daAlink_cCFPfPfi */ void daAlink_c::getArrowFlyData(f32* o_distance, f32* o_speed, int i_forceCharge) const { - if (mEquipItem == PACHINKO) { + if (mEquipItem == fpcNm_ITEM_PACHINKO) { *o_distance = daAlinkHIO_bow_c0::m.mSlingshotDistance; *o_speed = daAlinkHIO_bow_c0::m.mSlingshotSpeed; } else if (dComIfGp_checkPlayerStatus0(0, 0x200000)) { @@ -56,7 +56,7 @@ f32 daAlink_c::getArrowIncAtMax() const { /* 800DE780-800DE7D4 0D90C0 0054+00 10/10 0/0 0/0 .text checkBowAndSlingItem__9daAlink_cFi */ BOOL daAlink_c::checkBowAndSlingItem(int i_itemNo) { - return checkBowItem(i_itemNo) || i_itemNo == PACHINKO; + return checkBowItem(i_itemNo) || i_itemNo == fpcNm_ITEM_PACHINKO; } /* 800DE7D4-800DE884 0D9114 00B0+00 1/1 0/0 0/0 .text setSlingModel__9daAlink_cFv */ @@ -75,7 +75,7 @@ void daAlink_c::setSlingModel() { /* 800DE884-800DE990 0D91C4 010C+00 0/0 1/1 1/1 .text checkBowCameraArrowPosP__9daAlink_cFPsPs */ cXyz* daAlink_c::checkBowCameraArrowPosP(s16* param_0, s16* param_1) { - if (!checkBowAnime() || mEquipItem == PACHINKO) { + if (!checkBowAnime() || mEquipItem == fpcNm_ITEM_PACHINKO) { return NULL; } @@ -152,7 +152,7 @@ void daAlink_c::deleteArrow() { /* 800DEB8C-800DEBC8 0D94CC 003C+00 6/6 0/0 0/0 .text setBowOrSlingStatus__9daAlink_cFv */ void daAlink_c::setBowOrSlingStatus() { - if (mEquipItem == PACHINKO) { + if (mEquipItem == fpcNm_ITEM_PACHINKO) { dComIfGp_setPlayerStatus0(0, 0x40); } else { dComIfGp_setPlayerStatus0(0, 0x1000); @@ -161,10 +161,10 @@ void daAlink_c::setBowOrSlingStatus() { /* 800DEBC8-800DED88 0D9508 01C0+00 1/1 0/0 0/0 .text changeArrowType__9daAlink_cFv */ void daAlink_c::changeArrowType() { - if (checkCanoeSlider() || (mEquipItem == BOW && field_0x301e == 0) || - (mEquipItem == BOMB_ARROW && field_0x301e == 0 && + if (checkCanoeSlider() || (mEquipItem == fpcNm_ITEM_BOW && field_0x301e == 0) || + (mEquipItem == fpcNm_ITEM_BOMB_ARROW && field_0x301e == 0 && dComIfGp_getSelectItemNum(mSelectItemId) == 0) || - (mEquipItem == HAWK_ARROW && checkAttentionLock())) + (mEquipItem == fpcNm_ITEM_HAWK_ARROW && checkAttentionLock())) { return; } @@ -172,7 +172,7 @@ void daAlink_c::changeArrowType() { setItemActionButtonStatus(0x11); if (arrowChangeTrigger()) { - if (mEquipItem == HAWK_ARROW) { + if (mEquipItem == fpcNm_ITEM_HAWK_ARROW) { if (dComIfGp_checkPlayerStatus0(0, 0x200000)) { dComIfGp_clearPlayerStatus0(0, 0x200000); seStartSystem(Z2SE_AL_HAWK_EYE_PUTOFF); @@ -217,7 +217,7 @@ BOOL daAlink_c::cancelBowMove() { /* 800DEEDC-800DEFB8 0D981C 00DC+00 3/3 0/0 0/0 .text setBowReadyAnime__9daAlink_cFv */ void daAlink_c::setBowReadyAnime() { if (!checkBowAnime()) { - if (mEquipItem == BOMB_ARROW) { + if (mEquipItem == fpcNm_ITEM_BOMB_ARROW) { if (dComIfGp_getSelectItemNum(mSelectItemId) != 0) { field_0x301e = 1; } else { @@ -239,7 +239,7 @@ void daAlink_c::setBowReadyAnime() { field_0x2f97 = 5; field_0x2f96 = 4; - if (mEquipItem == PACHINKO) { + if (mEquipItem == fpcNm_ITEM_PACHINKO) { changeItemBck(0x1F1, -1.0f); } else { changeItemBck(0x43, -1.0f); @@ -252,7 +252,7 @@ void daAlink_c::setBowReloadAnime() { setFacePriTexture(FTANM_UNK_8); setFacePriBck(0xE5); - if (mEquipItem == PACHINKO) { + if (mEquipItem == fpcNm_ITEM_PACHINKO) { changeItemBck(0x1F0, daAlinkHIO_bow_c0::m.mLoadAnm.mStartFrame); field_0x2f97 = 5; seStartOnlyReverb(Z2SE_AL_PACHINKO_DRAW); @@ -270,14 +270,14 @@ void daAlink_c::setBowReloadAnime() { BOOL daAlink_c::checkUpperItemActionBow() { daPy_frameCtrl_c* frameCtrl_p = &mUpperFrameCtrl[2]; - if (mEquipItem == PACHINKO) { + if (mEquipItem == fpcNm_ITEM_PACHINKO) { mDoMtx_multVec(getLeftItemMatrix(), &slingLocalPos, &mHeldItemRootPos); } if (checkBowChargeWaitAnime()) { daArrow_c* arrow_p = (daArrow_c*)mItemAcKeep.getActor(); - if (mEquipItem != PACHINKO) { + if (mEquipItem != fpcNm_ITEM_PACHINKO) { if (field_0x301c > 0) { field_0x301c--; @@ -299,7 +299,7 @@ BOOL daAlink_c::checkUpperItemActionBow() { field_0x2f96 = 0; u16 var_r29; - if (mEquipItem == PACHINKO) { + if (mEquipItem == fpcNm_ITEM_PACHINKO) { var_r29 = 0x1F1; if (dComIfGs_getPachinkoNum() != 0 && daArrow_c::makeSlingStone(this, &mHeldItemRootPos) != NULL) @@ -314,7 +314,7 @@ BOOL daAlink_c::checkUpperItemActionBow() { changeItemBck(var_r29, daAlinkHIO_bow_c0::m.mShootAnm.mStartFrame); mItemVar0.field_0x3018 = 0; - } else if (mEquipItem == PACHINKO) { + } else if (mEquipItem == fpcNm_ITEM_PACHINKO) { if (!itemButton()) { dComIfGp_getVibration().StartShock(1, 1, cXyz(0.0f, 1.0f, 0.0f)); seStartOnlyReverb(Z2SE_AL_PACHINKO_SHOT); @@ -364,7 +364,7 @@ BOOL daAlink_c::checkUpperItemActionBow() { mItemVar0.field_0x3018 = 1; resetFacePriAnime(); - if (mEquipItem == BOW) { + if (mEquipItem == fpcNm_ITEM_BOW) { field_0x301e = 0; } } else { @@ -377,7 +377,7 @@ BOOL daAlink_c::checkUpperItemActionBow() { setFacePriTexture(FTANM_UNK_9); setFacePriBck(0xE6); - if (mEquipItem != PACHINKO) { + if (mEquipItem != fpcNm_ITEM_PACHINKO) { changeItemBck(0x42, 0.0f); dComIfGp_getVibration().StartQuake(1, 1, cXyz(0.0f, 1.0f, 0.0f)); onNoResetFlg3(FLG3_UNK_4); @@ -398,12 +398,12 @@ BOOL daAlink_c::checkUpperItemActionBow() { { setBowReloadAnime(); - if (mEquipItem == PACHINKO) { + if (mEquipItem == fpcNm_ITEM_PACHINKO) { mItemVar0.field_0x3018 = 0; } else { makeArrow(); } - } else if (mEquipItem == HAWK_ARROW) { + } else if (mEquipItem == fpcNm_ITEM_HAWK_ARROW) { changeArrowType(); } @@ -435,7 +435,7 @@ BOOL daAlink_c::checkUpperItemActionBow() { } } - if (checkBowWaitAnime() || (mEquipItem == PACHINKO && checkBowChargeWaitAnime())) { + if (checkBowWaitAnime() || (mEquipItem == fpcNm_ITEM_PACHINKO && checkBowChargeWaitAnime())) { field_0x33dc += daAlinkHIO_bow_c0::m.mShootAnm.mSpeed; } else { field_0x33dc = mUpperFrameCtrl[2].getFrame(); @@ -474,7 +474,7 @@ int daAlink_c::checkNextActionBow() { mItemMode = 0; mItemVar0.field_0x3018 = 1; - if (mEquipItem == HAWK_ARROW) { + if (mEquipItem == fpcNm_ITEM_HAWK_ARROW) { var_r31 = true; mFastShotTime = 0; } @@ -558,7 +558,7 @@ void daAlink_c::setBowHangAnime() { void daAlink_c::setBowNormalAnime() { if (checkBowItem(mEquipItem)) { changeItemBck(0x59, -1.0f); - } else if (mEquipItem == PACHINKO) { + } else if (mEquipItem == fpcNm_ITEM_PACHINKO) { changeItemBck(0x1F9, -1.0f); } } diff --git a/src/d/actor/d_a_alink_canoe.inc b/src/d/actor/d_a_alink_canoe.inc index a9953c3b28..c48b574be9 100644 --- a/src/d/actor/d_a_alink_canoe.inc +++ b/src/d/actor/d_a_alink_canoe.inc @@ -91,9 +91,9 @@ void daAlink_c::initFishingRodHand() { field_0x2f95 = 0x65; mItemVar0.field_0x3018 = 1; - if (mEquipItem == JEWEL_WORM_ROD || mEquipItem == WORM_ROD) { + if (mEquipItem == fpcNm_ITEM_JEWEL_WORM_ROD || mEquipItem == fpcNm_ITEM_WORM_ROD) { mItemMode = 0x74; - } else if (mEquipItem == JEWEL_BEE_ROD || mEquipItem == BEE_ROD) { + } else if (mEquipItem == fpcNm_ITEM_JEWEL_BEE_ROD || mEquipItem == fpcNm_ITEM_BEE_ROD) { mItemMode = 0x76; } else { mItemMode = 0xFF; @@ -624,7 +624,7 @@ int daAlink_c::procCanoeWaitInit(int param_0) { var_f31 = 3.0f; mProcVar0.field_0x3008 = 0; - if (mEquipItem == NO_ITEM || (mEquipItem != 0x10B && !checkFisingRodLure())) { + if (mEquipItem == fpcNm_ITEM_NONE || (mEquipItem != 0x10B && !checkFisingRodLure())) { var_r27 = ANM_WAIT_SIT; } else if (mProcVar5.field_0x3012 == 0) { var_r27 = ANM_WAIT_CANOE_LEFT; @@ -636,7 +636,7 @@ int daAlink_c::procCanoeWaitInit(int param_0) { setSyncCanoePos(); setSingleAnimeBaseMorf(var_r27, var_f31); - if (param_0 && mEquipItem != 0x10B && mEquipItem != NO_ITEM && !checkFisingRodLure()) { + if (param_0 && mEquipItem != 0x10B && mEquipItem != fpcNm_ITEM_NONE && !checkFisingRodLure()) { allUnequip(0); } @@ -671,7 +671,7 @@ int daAlink_c::procCanoeWait() { return procCanoePaddlePutInit(1); } - if (mEquipItem != NO_ITEM) { + if (mEquipItem != fpcNm_ITEM_NONE) { allUnequip(0); } @@ -681,7 +681,7 @@ int daAlink_c::procCanoeWait() { if (checkFisingRodLure()) { procCanoeFishingWaitInit(); - } else if (mEquipItem == NO_ITEM && ((mThrowBoomerangAcKeep.getActor() == NULL && mProcVar1.field_0x300a == 0) || checkInputOnR())) { + } else if (mEquipItem == fpcNm_ITEM_NONE && ((mThrowBoomerangAcKeep.getActor() == NULL && mProcVar1.field_0x300a == 0) || checkInputOnR())) { field_0x2fde = 0xFF; if (mThrowBoomerangAcKeep.getActor() != NULL || mProcVar1.field_0x300a != 0) { @@ -695,7 +695,7 @@ int daAlink_c::procCanoeWait() { procCanoePaddleGrabInit(); } else if (checkInputOnR() && mEquipItem == 0x10B) { procCanoeRowInit(-1); - } else if (mEquipItem != NO_ITEM && mEquipItem != 0x10B) { + } else if (mEquipItem != fpcNm_ITEM_NONE && mEquipItem != 0x10B) { if (!checkUnderMove0BckNoArc(ANM_WAIT_SIT) && getNowAnmPackUnder(UNDER_0) != getNowAnmPackUpper(UPPER_0)) { setSingleAnimeBase(ANM_WAIT_SIT); } else if (checkInputOnR()) { @@ -969,7 +969,7 @@ int daAlink_c::procCanoePaddleShift() { int daAlink_c::procCanoePaddlePutInit(int param_0) { if (checkCanoeSlider() && mEquipItem == 0x10B) { if (checkEquipAnime() && checkBowItem(field_0x2fde)) { - mEquipItem = NO_ITEM; + mEquipItem = fpcNm_ITEM_NONE; field_0x2f93 = 0xFE; field_0x2f92 = 0xFE; return procCanoeWaitInit(0); @@ -1037,7 +1037,7 @@ int daAlink_c::procCanoePaddlePut() { mEquipItem = 0x105; field_0x2f93 = 5; } else { - mEquipItem = NO_ITEM; + mEquipItem = fpcNm_ITEM_NONE; field_0x2f93 = 0xFE; } @@ -1113,7 +1113,7 @@ int daAlink_c::procCanoePaddleGrab() { int daAlink_c::procCanoeRodGrabInit() { commonProcInit(PROC_CANOE_ROD_GRAB); - if (mEquipItem != NO_ITEM) { + if (mEquipItem != fpcNm_ITEM_NONE) { allUnequip(0); mProcVar0.field_0x3008 = 1; } else { @@ -1738,10 +1738,10 @@ int daAlink_c::procFishingCast() { mItemMode = 0xFF; dComIfGs_setBaitItem(0xFF); - if (mEquipItem == JEWEL_WORM_ROD || mEquipItem == JEWEL_BEE_ROD) { - mEquipItem = JEWEL_ROD; + if (mEquipItem == fpcNm_ITEM_JEWEL_WORM_ROD || mEquipItem == fpcNm_ITEM_JEWEL_BEE_ROD) { + mEquipItem = fpcNm_ITEM_JEWEL_ROD; } else { - mEquipItem = FISHING_ROD_1; + mEquipItem = fpcNm_ITEM_FISHING_ROD_1; } } @@ -1815,15 +1815,15 @@ int daAlink_c::procFishingFood() { mProcVar2.field_0x300c = 1; u32 temp_r3 = dComIfGp_getSelectItem(mProcVar3.field_0x300e); - if (temp_r3 == WORM || dComIfGp_getSelectItemNum(mProcVar3.field_0x300e) == 1) { + if (temp_r3 == fpcNm_ITEM_WORM || dComIfGp_getSelectItemNum(mProcVar3.field_0x300e) == 1) { dComIfGs_setEquipBottleItemEmpty(mProcVar3.field_0x300e); } else { dComIfGp_addSelectItemNum(mProcVar3.field_0x300e, -1); } - if (mItemMode != NO_ITEM) { + if (mItemMode != fpcNm_ITEM_NONE) { dComIfGs_setEquipBottleItemIn(mProcVar3.field_0x300e, mItemMode); - if (mItemMode == BEE_CHILD) { + if (mItemMode == fpcNm_ITEM_BEE_CHILD) { dComIfGp_setSelectItemNum(mProcVar3.field_0x300e, 1); } } @@ -1831,16 +1831,16 @@ int daAlink_c::procFishingFood() { mItemMode = temp_r3; BOOL temp_r28 = checkFisingRodJewl(); - if (temp_r3 == WORM) { + if (temp_r3 == fpcNm_ITEM_WORM) { if (temp_r28) { - mEquipItem = JEWEL_WORM_ROD; + mEquipItem = fpcNm_ITEM_JEWEL_WORM_ROD; } else { - mEquipItem = WORM_ROD; + mEquipItem = fpcNm_ITEM_WORM_ROD; } } else if (temp_r28) { - mEquipItem = JEWEL_BEE_ROD; + mEquipItem = fpcNm_ITEM_JEWEL_BEE_ROD; } else { - mEquipItem = BEE_ROD; + mEquipItem = fpcNm_ITEM_BEE_ROD; } dComIfGs_setBaitItem(temp_r3); diff --git a/src/d/actor/d_a_alink_copyrod.inc b/src/d/actor/d_a_alink_copyrod.inc index ebadb9b496..bb68ec4317 100644 --- a/src/d/actor/d_a_alink_copyrod.inc +++ b/src/d/actor/d_a_alink_copyrod.inc @@ -201,7 +201,7 @@ int daAlink_c::returnCopyRod() { offNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER); int var_r31; - if (mEquipItem == COPY_ROD) { + if (mEquipItem == fpcNm_ITEM_COPY_ROD) { mItemAcKeep = mCopyRodAcKeep; onNoResetFlg0(FLG0_UNK_20); var_r31 = 1; @@ -444,9 +444,9 @@ int daAlink_c::procCopyRodReviveInit() { } if (mDemo.getParam0() == 0) { - if (mEquipItem != COPY_ROD) { + if (mEquipItem != fpcNm_ITEM_COPY_ROD) { deleteEquipItem(0, 0); - mEquipItem = COPY_ROD; + mEquipItem = fpcNm_ITEM_COPY_ROD; setCopyRodModel(); } field_0x0724->setFrame(0.0f); diff --git a/src/d/actor/d_a_alink_crawl.inc b/src/d/actor/d_a_alink_crawl.inc index 38197fe820..d897b2a971 100644 --- a/src/d/actor/d_a_alink_crawl.inc +++ b/src/d/actor/d_a_alink_crawl.inc @@ -467,7 +467,7 @@ void daAlink_c::setCrawlAutoMoveAimPos() { /* 800F9210-800F9384 0F3B50 0174+00 2/2 0/0 0/0 .text procCrawlStartInit__9daAlink_cFv */ int daAlink_c::procCrawlStartInit() { - if (mEquipItem != NO_ITEM) { + if (mEquipItem != fpcNm_ITEM_NONE) { return procPreActionUnequipInit(PROC_CRAWL_START, NULL); } diff --git a/src/d/actor/d_a_alink_cut.inc b/src/d/actor/d_a_alink_cut.inc index c998e6d335..73ba33e0fb 100644 --- a/src/d/actor/d_a_alink_cut.inc +++ b/src/d/actor/d_a_alink_cut.inc @@ -117,7 +117,7 @@ bool daAlink_c::checkCutFastReady() { fopAc_ac_c* target_p = mAttention->LockonTarget(0); - if (mEquipItem == NO_ITEM && (dComIfGs_isEventBit(0x2A80) || checkNoResetFlg3(FLG3_UNK_80))) + if (mEquipItem == fpcNm_ITEM_NONE && (dComIfGs_isEventBit(0x2A80) || checkNoResetFlg3(FLG3_UNK_80))) { if (checkModeFlg(1) && !checkRideOn() && i_checkSwordGet() && checkModeFlg(4) && !checkModeFlg(0x40000) && mTargetedActor == NULL && checkEnemyGroup(target_p)) @@ -140,7 +140,7 @@ bool daAlink_c::checkCutFastReady() { /* 800D1268-800D1310 0CBBA8 00A8+00 9/9 0/0 0/0 .text setSwordModel__9daAlink_cFv */ void daAlink_c::setSwordModel() { field_0x2fde = 0xFF; - mEquipItem = EQUIP_SWORD; + mEquipItem = 0x103; mDoAud_bgmSetSwordUsing(1); field_0x2f94 = 0; @@ -192,7 +192,7 @@ void daAlink_c::resetCombo(int param_0) { /* 800D1454-800D152C 0CBD94 00D8+00 1/1 0/0 0/0 .text checkComboCnt__9daAlink_cFv */ void daAlink_c::checkComboCnt() { - if ((mEquipItem == EQUIP_SWORD && mComboCutCount == 2) && + if ((mEquipItem == 0x103 && mComboCutCount == 2) && (checkAttentionLock() && (mAtCps[0].ChkAtHit() || mAtCps[1].ChkAtHit() || mAtCps[2].ChkAtHit()))) { @@ -227,7 +227,7 @@ void daAlink_c::setCylAtParam(u32 i_AtType, dCcG_At_Spl i_spl, u8 i_hitMark, u8 } else { mtrl = dCcD_MTRL_NONE; } - } else if (mEquipItem == WATER_BOTTLE) { + } else if (mEquipItem == fpcNm_ITEM_WATER_BOTTLE) { mtrl = dCcD_MTRL_UNK_6; } else { mtrl = dCcD_MTRL_NONE; @@ -366,11 +366,11 @@ BOOL daAlink_c::checkCutReverseAt(dCcD_GObjInf* param_0) { /* 800D19C8-800D1E1C 0CC308 0454+00 5/5 0/0 0/0 .text * changeCutReverseProc__9daAlink_cFQ29daAlink_c11daAlink_ANM */ BOOL daAlink_c::changeCutReverseProc(daAlink_c::daAlink_ANM param_0) { - if (checkCutReverseAt(&mAtCps[0]) || (mEquipItem != COPY_ROD && (checkCutReverseAt(&mAtCps[1]) || checkCutReverseAt(&mAtCps[2])))) { + if (checkCutReverseAt(&mAtCps[0]) || (mEquipItem != fpcNm_ITEM_COPY_ROD && (checkCutReverseAt(&mAtCps[1]) || checkCutReverseAt(&mAtCps[2])))) { return procCutReverseInit(param_0); } - if (checkNoResetFlg0(FLG0_UNK_40) || mEquipItem == COPY_ROD) { + if (checkNoResetFlg0(FLG0_UNK_40) || mEquipItem == fpcNm_ITEM_COPY_ROD) { cXyz sp28; Vec sp1C; @@ -501,7 +501,7 @@ void daAlink_c::setCutDash(int param_0, int param_1) { /* 800D20B4-800D20FC 0CC9F4 0048+00 4/4 0/0 0/0 .text checkForceSwordSwing__9daAlink_cFv */ BOOL daAlink_c::checkForceSwordSwing() { - return mEquipItem == EQUIP_SWORD && swordSwingTrigger(); + return mEquipItem == 0x103 && swordSwingTrigger(); } /* 800D20FC-800D2188 0CCA3C 008C+00 7/7 0/0 0/0 .text setComboReserb__9daAlink_cFv */ diff --git a/src/d/actor/d_a_alink_damage.inc b/src/d/actor/d_a_alink_damage.inc index 4f22e4a941..2ff72f0f56 100644 --- a/src/d/actor/d_a_alink_damage.inc +++ b/src/d/actor/d_a_alink_damage.inc @@ -649,7 +649,7 @@ BOOL daAlink_c::checkDamageAction() { return procHorseHangInit(var_r29, 0); } } else if (at_spl == 8 || checkModeFlg(0x70C52)) { - if (!checkModeFlg(0x400) && mEquipItem != IRONBALL) { + if (!checkModeFlg(0x400) && mEquipItem != fpcNm_ITEM_IRONBALL) { setSmallGuard(var_r29); } } else { @@ -1670,7 +1670,7 @@ int daAlink_c::procCoElecDamageInit(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, daAlink_ANM var_r29; daAlink_WANM var_r28; if ((mLinkAcch.i_ChkGroundHit() && !temp_r27) || checkMagneBootsOn()) { - if (mEquipItem == IRONBALL) { + if (mEquipItem == fpcNm_ITEM_IRONBALL) { setIronBallWaitUpperAnime(1); } var_r29 = ANM_ELEC_STUN_GND; diff --git a/src/d/actor/d_a_alink_demo.inc b/src/d/actor/d_a_alink_demo.inc index 51c08ef892..59db73f632 100644 --- a/src/d/actor/d_a_alink_demo.inc +++ b/src/d/actor/d_a_alink_demo.inc @@ -45,8 +45,8 @@ bool daAlink_c::checkSetNpcTks(cXyz* i_basePos, int i_roomNo, int param_2) { if (param_2 != 0 && checkDungeon() && i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) != 0x17 && i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) != 0x18 && - (checkItemGet(TKS_LETTER, 1) || - (checkItemGet(DUNGEON_BACK, 1) && !checkLv7DungeonShop())) && + (checkItemGet(fpcNm_ITEM_TKS_LETTER, 1) || + (checkItemGet(fpcNm_ITEM_DUNGEON_BACK, 1) && !checkLv7DungeonShop())) && dComIfGs_isDungeonItemWarp()) { if (!dComIfGs_isStageBossEnemy()) { @@ -87,11 +87,11 @@ int daAlink_c::checkDemoAction() { JUT_ASSERT(155, (demoMode < daPy_demo_c::DEMO_LAST_e) || (demoMode == daPy_demo_c::DEMO_NEW_ANM0_e)); - if (demoMode != 6 && demoMode != 8) { + if (demoMode != daPy_demo_c::DEMO_UNK_6_e && demoMode != daPy_demo_c::DEMO_UNK_8_e) { offNoResetFlg0(FLG0_UNK_400); } - if (demoMode != 0x33 && mSpecialMode == 1) { + if (demoMode != daPy_demo_c::DEMO_SUMOU_SHIKO_e && mSpecialMode == 1) { return procSumouReadyInit(); } @@ -99,13 +99,28 @@ int daAlink_c::checkDemoAction() { return 0; } - if (!checkModeFlg(0x400) && demoMode != daPy_demo_c::DEMO_NEW_ANM0_e && demoMode != 0x46 && - demoMode != 0x47 && demoMode != 0x39 && demoMode != 0x3A && demoMode != 9 && - demoMode != 0x11 && demoMode != 0x18 && demoMode != 7 && demoMode != 0x13 && - demoMode != 4 && demoMode != 0x38 && demoMode != 0x45 && demoMode != 0xA && - demoMode != 0x2D && demoMode != 0x23 && demoMode != 0x43 && demoMode != 0x34 && - (demoMode != 0xB || !checkModeFlg(0x10040)) && - !dComIfGp_checkPlayerStatus0(0, 0x100000) && !checkFlyAtnWait() && + if (!checkModeFlg(0x400) && + demoMode != daPy_demo_c::DEMO_NEW_ANM0_e && + demoMode != daPy_demo_c::DEMO_METAMORPHOSE_ONLY_UNK1_e && + demoMode != daPy_demo_c::DEMO_METAMORPHOSE_ONLY_UNK2_e && + demoMode != daPy_demo_c::DEMO_METAMORPHOSE_UNK1_e && + demoMode != daPy_demo_c::DEMO_METAMORPHOSE_UNK2_e && + demoMode != daPy_demo_c::DEMO_UNK_9_e && + demoMode != daPy_demo_c::DEMO_UNK_17_e && + demoMode != daPy_demo_c::DEMO_UNK_24_e && + demoMode != daPy_demo_c::DEMO_UNK_7_e && + demoMode != daPy_demo_c::DEMO_MONKEY_MOVE_e && + demoMode != daPy_demo_c::DEMO_UNK_4_e && + demoMode != daPy_demo_c::DEMO_WOLF_CARGO_CARRY_e && + demoMode != daPy_demo_c::DEMO_ZORA_MOVE_e && + demoMode != daPy_demo_c::DEMO_OPEN_TREASURE_e && + demoMode != daPy_demo_c::DEMO_UNK_45_e && + demoMode != daPy_demo_c::DEMO_DOOR_OPEN_e && + demoMode != daPy_demo_c::DEMO_FM_CHAIN_STRONG_PULL_e && + demoMode != daPy_demo_c::DEMO_FOG_DEAD_e && + (demoMode != daPy_demo_c::DEMO_GET_ITEM_e || !checkModeFlg(0x10040)) && + !dComIfGp_checkPlayerStatus0(0, 0x100000) && + !checkFlyAtnWait() && ((!mLinkAcch.ChkGroundHit() && !checkMagneBootsOn()) || checkModeFlg(0x70C52))) { return 0; @@ -130,7 +145,7 @@ int daAlink_c::checkDemoAction() { return (this->*m_demoInitTable[demoMode])(); } - if (demoMode == 6 || demoMode == 8) { + if (demoMode == daPy_demo_c::DEMO_UNK_6_e || demoMode == daPy_demo_c::DEMO_UNK_8_e) { if (mDemo.getParam1() != 1 && !checkNoResetFlg0(FLG0_UNK_400)) { seStartSystem(Z2SE_SY_TALK_START); onNoResetFlg0(FLG0_UNK_400); @@ -143,8 +158,8 @@ int daAlink_c::checkDemoAction() { if (checkModeFlg(0x4000000) || checkModeFlg(0x40000) || checkHorseRide() || checkBoarRide() || checkCanoeRide()) { - if (demoMode == 6 && (checkHorseRide() || checkBoarRide())) { - if (mEquipItem != NO_ITEM && mEquipItem != KANTERA && !checkEquipAnime()) { + if (demoMode == daPy_demo_c::DEMO_UNK_6_e && (checkHorseRide() || checkBoarRide())) { + if (mEquipItem != fpcNm_ITEM_NONE && mEquipItem != fpcNm_ITEM_KANTERA && !checkEquipAnime()) { allUnequip(1); } } @@ -176,7 +191,7 @@ int daAlink_c::checkDemoAction() { } return procCoTalkInit(); - } else if (demoMode == 4) { + } else if (demoMode == daPy_demo_c::DEMO_UNK_4_e) { int var_r28; if (checkWolf()) { var_r28 = procWolfWaitInit(); @@ -198,7 +213,7 @@ int daAlink_c::checkDemoAction() { } else if (mDemo.getParam0() == 4) { if (!checkFishingRodItem(mEquipItem)) { deleteEquipItem(FALSE, TRUE); - mEquipItem = FISHING_ROD_1; + mEquipItem = fpcNm_ITEM_FISHING_ROD_1; setGroundFishingRodActor(); } } else if (mDemo.getParam0() == 3) { @@ -237,7 +252,7 @@ int daAlink_c::checkDemoAction() { field_0x2060->initOldFrameMorf(0.0f, 0, field_0x30c6); } return var_r28; - } else if (demoMode == 9) { + } else if (demoMode == daPy_demo_c::DEMO_UNK_9_e) { onNoResetFlg0(FLG0_UNK_100000); if (mProcID == PROC_LARGE_DAMAGE_UP || mProcID == PROC_WOLF_LARGE_DAMAGE_UP || mProcID == PROC_LARGE_DAMAGE_WALL) @@ -251,7 +266,7 @@ int daAlink_c::checkDemoAction() { } return procCoLargeDamageInit(-2, 1, 0, 0, NULL, 0); - } else if (demoMode == 0x24) { + } else if (demoMode == daPy_demo_c::DEMO_UNK_36_e) { onNoResetFlg0(FLG0_UNK_100000); int prm0 = mDemo.getParam0(); if (mProcID == PROC_CUT_NORMAL || mProcID == PROC_CUT_FINISH || mProcID == PROC_CUT_TURN) { @@ -267,7 +282,7 @@ int daAlink_c::checkDemoAction() { } else { return procCutTurnInit(1, 1); } - } else if (demoMode == 0x52) { + } else if (demoMode == daPy_demo_c::DEMO_UNK_82_e) { onNoResetFlg0(FLG0_UNK_100000); if (mProcID == PROC_TURN_MOVE || mProcID == PROC_CUT_FINISH_JUMP_UP || mProcID == PROC_CUT_FINISH_JUMP_UP_LAND) @@ -276,7 +291,7 @@ int daAlink_c::checkDemoAction() { } return procTurnMoveInit(2); - } else if (demoMode == 0x54) { + } else if (demoMode == daPy_demo_c::DEMO_UNK_84_e) { onNoResetFlg0(FLG0_UNK_100000); if (mProcID != PROC_CUT_FINISH) { onNoResetFlg0(FLG0_UNK_1000000); @@ -284,7 +299,7 @@ int daAlink_c::checkDemoAction() { } return 1; - } else if (demoMode == 0x2B) { + } else if (demoMode == daPy_demo_c::DEMO_UNK_43_e) { onNoResetFlg0(FLG0_UNK_100000); int prm0 = mDemo.getParam0(); @@ -297,7 +312,7 @@ int daAlink_c::checkDemoAction() { } else { return procWolfWaitAttackInit(prm0); } - } else if (demoMode == 0x1B) { + } else if (demoMode == daPy_demo_c::DEMO_UNK_27_e) { onNoResetFlg0(FLG0_UNK_100000); if (mDemo.getDemoType() == 1) { @@ -307,29 +322,29 @@ int daAlink_c::checkDemoAction() { } else { return commonLargeDamageUpInit(-3, 1, 0, 0); } - } else if (demoMode == 0xF) { + } else if (demoMode == daPy_demo_c::DEMO_UNK_15_e) { onNoResetFlg0(FLG0_UNK_100000); return procWolfSitInit(1); - } else if (demoMode == 0x15) { + } else if (demoMode == daPy_demo_c::DEMO_UNK_21_e) { onNoResetFlg0(FLG0_UNK_100000); return procWolfHowlInit(0); - } else if (demoMode == 0x16) { + } else if (demoMode == daPy_demo_c::DEMO_UNK_22_e) { onNoResetFlg0(FLG0_UNK_100000); return procWolfHowlInit(1); - } else if (demoMode == 0x2D) { + } else if (demoMode == daPy_demo_c::DEMO_UNK_45_e) { onNoResetFlg0(FLG0_UNK_100000); return procCoWarpInit(mDemo.getParam0(), mDemo.getParam1()); - } else if (demoMode == 0x18) { + } else if (demoMode == daPy_demo_c::DEMO_UNK_24_e) { onNoResetFlg0(FLG0_UNK_100000); return procAutoJumpInit(1); - } else if (demoMode == 0x5B) { + } else if (demoMode == daPy_demo_c::DEMO_UNK_91_e) { if (mProcID == PROC_CUT_TURN_MOVE || mProcID == PROC_CUT_TURN_CHARGE) { return 1; } onNoResetFlg0(FLG0_UNK_100000); return procCutTurnChargeInit(); - } else if (demoMode == 0x5E) { + } else if (demoMode == daPy_demo_c::DEMO_UNK_94_e) { if (mProcID == PROC_WOLF_SERVICE_WAIT) { return 0; } @@ -340,17 +355,17 @@ int daAlink_c::checkDemoAction() { onNoResetFlg0(FLG0_UNK_100000); return procWolfServiceWaitInit(0); - } else if (demoMode == 0x5C) { + } else if (demoMode == daPy_demo_c::DEMO_UNK_92_e) { if (mProcID == PROC_CUT_LARGE_JUMP_CHARGE || mProcID == PROC_CUT_TURN_MOVE) { return 1; } onNoResetFlg0(FLG0_UNK_100000); return procCutLargeJumpChargeInit(); - } else if (demoMode == 0x49) { + } else if (demoMode == daPy_demo_c::DEMO_UNK_73_e) { onNoResetFlg0(FLG0_UNK_100000); return procSideRollInit(mDemo.getParam0() ? 3 : 2); - } else if (demoMode == 0x10) { + } else if (demoMode == daPy_demo_c::DEMO_UNK_16_e) { onNoResetFlg0(FLG0_UNK_100000); if (checkWolf()) { if (mProcID == PROC_WOLF_BACKJUMP_LAND || mProcID == PROC_WOLF_SIDESTEP_LAND || @@ -378,16 +393,16 @@ int daAlink_c::checkDemoAction() { } return procSideStepInit(mDemo.getParam0()); - } else if (demoMode == 0x2C) { + } else if (demoMode == daPy_demo_c::DEMO_UNK_44_e) { onNoResetFlg0(FLG0_UNK_100000); return procWolfLieMoveInit(0); - } else if (demoMode == 0x11) { + } else if (demoMode == daPy_demo_c::DEMO_UNK_17_e) { onNoResetFlg0(FLG0_UNK_100000); return commonFallInit(1); - } else if (demoMode == 0x2A) { + } else if (demoMode == daPy_demo_c::DEMO_UNK_42_e) { onNoResetFlg0(FLG0_UNK_100000); return procBottleDrinkInit(mDemo.getParam0()); - } else if (demoMode == 0x1F) { + } else if (demoMode == daPy_demo_c::DEMO_UNK_31_e) { onNoResetFlg0(FLG0_UNK_100000); if (!checkModeFlg(0x4070C52) && (checkUpperReadyThrowAnime() || field_0x2f8c == 2 || field_0x2f8c == 1 || @@ -399,7 +414,7 @@ int daAlink_c::checkDemoAction() { dComIfGp_evmng_cutEnd(field_0x3184); return 1; - } else if (demoMode == 7) { + } else if (demoMode == daPy_demo_c::DEMO_UNK_7_e) { offNoResetFlg0(FLG0_UNK_100000); if (checkUpperReadyThrowAnime() || checkGrabAnime()) { resetUpperAnime(UPPER_2, -1.0f); @@ -415,10 +430,10 @@ int daAlink_c::checkDemoAction() { } else if ((checkNoResetFlg0(FLG0_UNK_100000) || checkUpperReadyThrowAnime() || checkModeFlg(0x400) || mProcID == PROC_SWIM_SUBJECTIVITY || mProcID == PROC_FISHING_CAST || mProcID == PROC_SUBJECTIVITY) && - (demoMode == 1 || checkDemoMoveMode(demoMode) || demoMode == 0x17 || - demoMode == 0x1F || demoMode == 0x12 || + (demoMode == daPy_demo_c::DEMO_UNK_1_e || checkDemoMoveMode(demoMode) || demoMode == daPy_demo_c::DEMO_UNK_23_e || + demoMode == daPy_demo_c::DEMO_UNK_31_e || demoMode == daPy_demo_c::DEMO_UNK_18_e || (checkSpinnerRide() && - (demoMode == 0x1A || (demoMode == 0xE && mDemo.getParam0() == 0))))) + (demoMode == daPy_demo_c::DEMO_UNK_26_e || (demoMode == daPy_demo_c::DEMO_UNK_14_e && mDemo.getParam0() == 0))))) { offNoResetFlg0(FLG0_UNK_100000); if (checkUpperReadyThrowAnime()) { @@ -426,7 +441,7 @@ int daAlink_c::checkDemoAction() { } if (checkReinRide()) { - if (mDemo.getDemoMode() == 0x17 && !checkEquipAnime() && mEquipItem != 0x103 && + if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_23_e && !checkEquipAnime() && mEquipItem != 0x103 && (mDemo.getParam1() == 2 || mDemo.getParam1() == 3)) { swordEquip(0); @@ -467,13 +482,13 @@ int daAlink_c::checkDemoAction() { /* 80116E60-80116E9C 1117A0 003C+00 4/4 0/0 0/0 .text checkDemoMoveMode__9daAlink_cCFUl */ bool daAlink_c::checkDemoMoveMode(u32 i_mode) const { - return i_mode == 2 || i_mode == 3 || i_mode == 0x26; + return i_mode == daPy_demo_c::DEMO_UNK_2_e || i_mode == daPy_demo_c::DEMO_UNK_3_e || i_mode == daPy_demo_c::DEMO_UNK_38_e; } /* 80116E9C-80117064 1117DC 01C8+00 1/1 0/0 0/0 .text setDemoMoveData__9daAlink_cFPUlPC4cXyz */ -void daAlink_c::setDemoMoveData(u32* param_0, cXyz const* param_1) { +void daAlink_c::setDemoMoveData(u32* o_mode, cXyz const* i_goal) { cXyz sp20; - sp20 = *param_1 - current.pos; + sp20 = *i_goal - current.pos; f32 temp_f30; f32 temp_f29; @@ -492,15 +507,15 @@ void daAlink_c::setDemoMoveData(u32* param_0, cXyz const* param_1) { f32 dist_to_pos = sp20.abs2XZ(); if (dist_to_pos < var_f27 * 25.0f) { - *param_0 = 1; + *o_mode = daPy_demo_c::DEMO_UNK_1_e; if (!checkModeFlg(0x2)) { mNormalSpeed = 0.0f; } } else if (dist_to_pos < temp_f30 || (dist_to_pos < temp_f28 && checkZeroSpeedF())) { - *param_0 = 1; - } else if ((*param_0 == 2 && dist_to_pos < temp_f29) || dist_to_pos < temp_f28) { - *param_0 = 2; + *o_mode = daPy_demo_c::DEMO_UNK_1_e; + } else if ((*o_mode == daPy_demo_c::DEMO_UNK_2_e && dist_to_pos < temp_f29) || dist_to_pos < temp_f28) { + *o_mode = daPy_demo_c::DEMO_UNK_2_e; mDemo.setStick(0.35f); } else if (mDemo.getDemoType() == 3) { mDemo.setStick(1.0f); @@ -574,7 +589,7 @@ void daAlink_c::setDemoData() { dDemo_actor_c* demo_actor_p = dDemo_c::getActor(demoActorID); cXyz* pos_p = NULL; s16 angle; - u32 demo_mode = 1; + u32 demo_mode = daPy_demo_c::DEMO_UNK_1_e; int* prm0_p = NULL; int* prm1_p = NULL; @@ -606,11 +621,11 @@ void daAlink_c::setDemoData() { if (mDemo.getDemoType() != 1) { mDemo.setToolDemoType(); - mDemo.setDemoMode(1); + mDemo.setDemoMode(daPy_demo_c::DEMO_UNK_1_e); freeGrabItem(); if (dComIfGp_evmng_startCheck("R22-opening")) { - if (mEquipItem == IRONBALL) { + if (mEquipItem == fpcNm_ITEM_IRONBALL) { deleteEquipItem(FALSE, FALSE); } } else { @@ -661,8 +676,8 @@ void daAlink_c::setDemoData() { mDemo.setSystemDemoType(); var_r28 = TRUE; - if (mDemo.getDemoMode() == 0) { - demo_mode = 0x41; + if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_0_e) { + demo_mode = daPy_demo_c::DEMO_UNK_65_e; } } @@ -677,15 +692,15 @@ void daAlink_c::setDemoData() { // demo_mode demo_mode = ((cut_name[0] - '0') * 100) + ((cut_name[1] - '0') * 10) + (cut_name[2] - '0'); - if (mDemo.getDemoType() != 4 && (demo_mode == 1 || demo_mode == 0x17) && + if (mDemo.getDemoType() != 4 && (demo_mode == daPy_demo_c::DEMO_UNK_1_e || demo_mode == daPy_demo_c::DEMO_UNK_23_e) && mLinkAcch.ChkGroundHit() && !checkModeFlg(0x70C52)) { mNormalSpeed = 0.0f; speedF = 0.0f; } - if (demo_mode == 0x32 && !daMidna_c::checkMidnaRealBody()) { - demo_mode = 1; + if (demo_mode == daPy_demo_c::DEMO_WOLF_MIDNA_RIDE_SHOCK_e && !daMidna_c::checkMidnaRealBody()) { + demo_mode = daPy_demo_c::DEMO_UNK_1_e; } pos_p = dComIfGp_evmng_getMyXyzP(field_0x3184, "pos"); @@ -696,7 +711,7 @@ void daAlink_c::setDemoData() { int* angle_p = dComIfGp_evmng_getMyIntegerP(field_0x3184, "angle"); if (angle_p != NULL) { angle = *angle_p; - } else if (demo_mode == 5) { + } else if (demo_mode == daPy_demo_c::DEMO_WAIT_TURN_e) { angle = mDemo.getMoveAngle(); } else { angle = shape_angle.y; @@ -715,7 +730,7 @@ void daAlink_c::setDemoData() { } } - if ((demo_mode == 2 || demo_mode == 3) && prm1_p != NULL && *prm1_p == 1) { + if ((demo_mode == daPy_demo_c::DEMO_UNK_2_e || demo_mode == daPy_demo_c::DEMO_UNK_3_e) && prm1_p != NULL && *prm1_p == 1) { cXyz goal_pos; mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(shape_angle.y); @@ -726,9 +741,9 @@ void daAlink_c::setDemoData() { } } - if ((mEquipItem == IRONBALL || checkFishingRodItem(mEquipItem)) && demo_mode != 1 && - demo_mode != 0x1F && (field_0x3184 != -1 || mDemo.getDemoType() == 3) && - (demo_mode != 6 || (var_r28 == 0 && !checkEquipAnime()))) + if ((mEquipItem == fpcNm_ITEM_IRONBALL || checkFishingRodItem(mEquipItem)) && demo_mode != daPy_demo_c::DEMO_UNK_1_e && + demo_mode != daPy_demo_c::DEMO_UNK_31_e && (field_0x3184 != -1 || mDemo.getDemoType() == 3) && + (demo_mode != daPy_demo_c::DEMO_UNK_6_e || (var_r28 == 0 && !checkEquipAnime()))) { deleteEquipItem(FALSE, TRUE); if (checkIronBallWaitAnime()) { @@ -738,7 +753,7 @@ void daAlink_c::setDemoData() { } if (mDemo.getDemoType() == 4) { - if (mDemo.getDemoMode() == 0xE) { + if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_14_e) { if (mDemo.getTimer() != 0) { mDemo.decTimer(); @@ -752,7 +767,7 @@ void daAlink_c::setDemoData() { } } } else { - if (mDemo.getDemoType() == 1 || (mDemo.getDemoType() == 2 && field_0x3184 != -1)) { + if (mDemo.getDemoType() == daPy_demo_c::DEMO_UNK_1_e || (mDemo.getDemoType() == daPy_demo_c::DEMO_UNK_2_e && field_0x3184 != -1)) { if (prm0_p != NULL) { mDemo.setParam0(*prm0_p); } else { @@ -765,7 +780,7 @@ void daAlink_c::setDemoData() { mDemo.setParam1(0); } - if (demo_mode == 4) { + if (demo_mode == daPy_demo_c::DEMO_UNK_4_e) { mNormalSpeed = 0.0f; speedF = 0.0f; field_0x814.ClrCcMove(); @@ -773,7 +788,7 @@ void daAlink_c::setDemoData() { mDemo.setMoveAngle(angle); } else if (checkDemoMoveMode(demo_mode)) { setDemoMoveData(&demo_mode, pos_p); - } else if (demo_mode == 5) { + } else if (demo_mode == daPy_demo_c::DEMO_WAIT_TURN_e) { mDemo.setMoveAngle(angle); } @@ -784,14 +799,14 @@ void daAlink_c::setDemoData() { if (checkDemoMoveMode(demo_mode)) { setDemoMoveData(&demo_mode, mDemo.getPos0()); mDemo.setDemoMode(demo_mode); - } else if (demo_mode == 0x41) { - mDemo.setDemoMode(1); + } else if (demo_mode == daPy_demo_c::DEMO_UNK_65_e) { + mDemo.setDemoMode(daPy_demo_c::DEMO_UNK_1_e); } } else { mDemo.setDemoMode(demo_mode); } - if (checkModeFlg(0x80000) || mDemo.getDemoMode() == 6 || mDemo.getDemoMode() == 8) { + if (checkModeFlg(0x80000) || mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_6_e || mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_8_e) { dComIfGp_setPlayerStatus0(0, 0x10); mMidnaTalkDelayTimer = 30; } else { @@ -799,10 +814,10 @@ void daAlink_c::setDemoData() { } if (field_0x3184 != -1 && - (demo_mode == 1 || demo_mode == 4 || demo_mode == 0x17 || demo_mode == 0xE || - demo_mode == 0x11 || demo_mode == 0x18 || demo_mode == 7 || demo_mode == 0xF || - demo_mode == 0x15 || demo_mode == 0x16 || demo_mode == 6 || demo_mode == 8 || - demo_mode == 0x29 || demo_mode == 0x12)) + (demo_mode == daPy_demo_c::DEMO_UNK_1_e || demo_mode == daPy_demo_c::DEMO_UNK_4_e || demo_mode == daPy_demo_c::DEMO_UNK_23_e || demo_mode == daPy_demo_c::DEMO_UNK_14_e || + demo_mode == daPy_demo_c::DEMO_UNK_17_e || demo_mode == daPy_demo_c::DEMO_UNK_24_e || demo_mode == daPy_demo_c::DEMO_UNK_7_e || demo_mode == daPy_demo_c::DEMO_UNK_15_e || + demo_mode == daPy_demo_c::DEMO_UNK_21_e || demo_mode == daPy_demo_c::DEMO_UNK_22_e || demo_mode == daPy_demo_c::DEMO_UNK_6_e || demo_mode == daPy_demo_c::DEMO_UNK_8_e || + demo_mode == daPy_demo_c::DEMO_CROUCH_e || demo_mode == daPy_demo_c::DEMO_UNK_18_e)) { dComIfGp_evmng_cutEnd(field_0x3184); } @@ -897,7 +912,7 @@ void daAlink_c::endDemoMode() { dComIfGp_clearPlayerStatus0(0, 0x10); BOOL temp_r29 = mDemo.getDemoType() == 4; - BOOL var_r0 = mDemo.getDemoMode() == 0xE || mDemo.getDemoMode() == 0x1A; + BOOL var_r0 = mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_14_e || mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_26_e; mDemo.resetDemoType(); mDemo.setDemoMode(0); @@ -943,7 +958,7 @@ void daAlink_c::endDemoMode() { commonCheckNextAction(0); } else if (mProcID == PROC_HAWK_CATCH || mProcID == PROC_HAWK_SUBJECT) { procHawkSubjectInit(); - } else if (mProcID == PROC_GRASS_WHISTLE_WAIT || (mDemo.getDemoMode() != 0x2D && mProcID == PROC_WARP)) { + } else if (mProcID == PROC_GRASS_WHISTLE_WAIT || (mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK_45_e && mProcID == PROC_WARP)) { return; } else if (mProcID == PROC_TALK && dComIfGp_checkPlayerStatus0(0, 0x8000000)) { procWolfLieMoveInit(0); @@ -986,7 +1001,7 @@ fopAc_ac_c* daAlink_c::getDemoLookActor() { /* 80118170-801181A0 112AB0 0030+00 4/4 0/0 0/0 .text checkFlyAtnWait__9daAlink_cFv */ BOOL daAlink_c::checkFlyAtnWait() { - return mDemo.getDemoMode() == 0x17 && (mDemo.getParam1() == 4 || mDemo.getParam1() == 5); + return mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_23_e && (mDemo.getParam1() == 4 || mDemo.getParam1() == 5); } /* 801181A0-801182D4 112AE0 0134+00 2/2 0/0 0/0 .text setGetItemFace__9daAlink_cFUs */ @@ -1077,7 +1092,7 @@ void daAlink_c::setShapeAngleToTalkActor() { /* 80118654-801186D4 112F94 0080+00 2/2 0/0 0/0 .text setTalkAnime__9daAlink_cFv */ void daAlink_c::setTalkAnime() { - if (mDemo.getDemoMode() == 8 || mEquipItem == KANTERA || + if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_8_e || mEquipItem == fpcNm_ITEM_KANTERA || (checkNoResetFlg2(FLG2_UNK_1) && field_0x2fde == 0x48)) { setDoubleAnime(0.0f, daAlinkHIO_move_c0::m.mWaitAnmSpeed, @@ -1100,7 +1115,7 @@ u8 daAlink_c::setTradeItemAnime() { item_no = dComIfGp_event_getPreItemNo(); } - u32 partner_id = fopAcM_createItemForPresentDemo( + fpc_ProcID partner_id = fopAcM_createItemForPresentDemo( ¤t.pos, item_no, 3, -1, fopAcM_GetRoomNo(this), &shape_angle, &scale); dComIfGp_event_setItemPartnerId(partner_id); } @@ -1123,7 +1138,7 @@ void daAlink_c::setTradeItemOutHand() { /* 801187B4-80118840 1130F4 008C+00 5/5 0/0 0/0 .text checkEndMessage__9daAlink_cFUl */ BOOL daAlink_c::checkEndMessage(u32 param_0) { - if (mMsgClassID == -1) { + if (mMsgClassID == fpcM_ERROR_PROCESS_ID_e) { mMsgClassID = fopMsgM_messageSet(param_0, 1000); } else { msg_class* msg = fopMsgM_SearchByID(mMsgClassID); @@ -1237,7 +1252,7 @@ BOOL daAlink_c::checkRestartDead(int i_dmgAmount, int i_checkZoraMag) { i_dmgAmount *= (int)damageMagnification(i_checkZoraMag, 1); if (mProcID != PROC_DEAD && i_dmgAmount >= dComIfGs_getLife() && !checkMagicArmorNoDamage() && - !dComIfGs_checkBottle(FAIRY)) + !dComIfGs_checkBottle(fpcNm_ITEM_FAIRY)) { onNoResetFlg2(FLG2_FORCE_GAMEOVER); procCoDeadInit(0); @@ -1262,7 +1277,7 @@ void daAlink_c::setDeadRideSyncPos() { /* 80118C98-80118D7C 1135D8 00E4+00 5/5 0/0 0/0 .text checkDeadHP__9daAlink_cFv */ BOOL daAlink_c::checkDeadHP() { - return ((dComIfGs_getLife() == 0 && !checkResetFlg0(RFLG0_UNK_400)) && !dComIfGs_checkBottle(FAIRY)) || + return ((dComIfGs_getLife() == 0 && !checkResetFlg0(RFLG0_UNK_400)) && !dComIfGs_checkBottle(fpcNm_ITEM_FAIRY)) || checkNoResetFlg2(FLG2_FORCE_GAMEOVER) || (dComIfGp_getOxygenShowFlag() && dComIfGp_getNowOxygen() == 0); } @@ -1296,9 +1311,9 @@ BOOL daAlink_c::checkDeadAction(int param_0) { return commonFallInit(1); } - } else if (dComIfGs_getLife() == 0 && !checkResetFlg0(RFLG0_UNK_400) && dComIfGs_checkBottle(FAIRY)) { + } else if (dComIfGs_getLife() == 0 && !checkResetFlg0(RFLG0_UNK_400) && dComIfGs_checkBottle(fpcNm_ITEM_FAIRY)) { makeFairy(¤t.pos, 0); - dComIfGs_setBottleItemIn(FAIRY, EMPTY_BOTTLE); + dComIfGs_setBottleItemIn(fpcNm_ITEM_FAIRY, fpcNm_ITEM_EMPTY_BOTTLE); } } @@ -1468,10 +1483,9 @@ int daAlink_c::procCoToolDemoInit() { return 1; } - f32 tmp_0 = 0.0f; - mNormalSpeed = tmp_0; - speedF = tmp_0; - speed.y = tmp_0; + mNormalSpeed = 0.0f; + speedF = 0.0f; + speed.y = 0.0f; mUnderAnmHeap[0].resetArcNo(); mUnderAnmHeap[0].resetIdx(); @@ -1479,7 +1493,7 @@ int daAlink_c::procCoToolDemoInit() { mUnderAnmHeap[1].resetIdx(); mUpperAnmHeap[1].resetIdx(); - setDoubleAnimeBlendRatio(tmp_0); + setDoubleAnimeBlendRatio(0.0f); mNowAnmPackUnder[1].setAnmTransform(NULL); mNowAnmPackUpper[1].setAnmTransform(NULL); @@ -1721,8 +1735,8 @@ int daAlink_c::procCoTalkInit() { commonProcInit(PROC_TALK); - if (mDemo.getDemoMode() == 6) { - if (mEquipItem != KANTERA && mEquipItem != NO_ITEM) { + if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_6_e) { + if (mEquipItem != fpcNm_ITEM_KANTERA && mEquipItem != fpcNm_ITEM_NONE) { allUnequip(1); } } @@ -1808,7 +1822,7 @@ int daAlink_c::procCoTalk() { mNormalSpeed = 0.0f; } } else { - if (mEquipItem == KANTERA) { + if (mEquipItem == fpcNm_ITEM_KANTERA) { if (mUpperAnmHeap[0].getIdx() != getMainBckData(ANM_WAIT)->m_upperID) { setSingleAnimeBaseSpeed(ANM_WAIT, daAlinkHIO_move_c0::m.mWaitAnmSpeed, 3.0f); } @@ -1919,7 +1933,7 @@ int daAlink_c::procCoUnequipInit() { setBlendMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); if (mDemo.getParam1() == 0) { - if (mEquipItem != NO_ITEM) { + if (mEquipItem != fpcNm_ITEM_NONE) { allUnequip(0); } } else if (mDemo.getParam1() == 1) { @@ -1942,7 +1956,7 @@ int daAlink_c::procCoUnequip() { if (mProcVar2.field_0x300c != 0) { if (checkAnmEnd(mUnderFrameCtrl)) { setBlendMoveAnime(3.0f); - itemEquip(COPY_ROD); + itemEquip(fpcNm_ITEM_COPY_ROD); f32 tmp_6 = 6.0f; mUpperFrameCtrl[2].setFrame(tmp_6); @@ -1979,8 +1993,8 @@ void daAlink_c::setGetSubBgm(int i_seTypeIdx) { /* 8011A6FC-8011A798 11503C 009C+00 1/0 0/0 0/0 .text checkTreasureRupeeReturn__9daAlink_cCFi */ BOOL daAlink_c::checkTreasureRupeeReturn(int i_itemNo) const { - if (i_itemNo == LINKS_SAVINGS) { - i_itemNo = PURPLE_RUPEE; + if (i_itemNo == fpcNm_ITEM_LINKS_SAVINGS) { + i_itemNo = fpcNm_ITEM_PURPLE_RUPEE; } i_itemNo -= 4; @@ -2010,9 +2024,9 @@ int daAlink_c::procCoGetItemInit() { mLinkAcch.ClrWallNone(); - if (!checkWolf() && mEquipItem != NO_ITEM && var_r30 == 0) { - if (checkModeFlg(0x400) || (checkStageName("D_MN05B") && mEquipItem == BOOMERANG && - !dComIfGs_isItemFirstBit(BOOMERANG))) + if (!checkWolf() && mEquipItem != fpcNm_ITEM_NONE && var_r30 == 0) { + if (checkModeFlg(0x400) || (checkStageName("D_MN05B") && mEquipItem == fpcNm_ITEM_BOOMERANG && + !dComIfGs_isItemFirstBit(fpcNm_ITEM_BOOMERANG))) { deleteEquipItem(0, 0); } else { @@ -2033,9 +2047,9 @@ int daAlink_c::procCoGetItemInit() { item_no = dComIfGp_event_getGtItm(); } - int item_partner_id = fopAcM_createItemForPresentDemo(¤t.pos, item_no, 0, -1, + fpc_ProcID item_partner_id = fopAcM_createItemForPresentDemo(¤t.pos, item_no, 0, -1, fopAcM_GetRoomNo(this), NULL, NULL); - if (item_partner_id != 0xFFFFFFFF) { + if (item_partner_id != fpcM_ERROR_PROCESS_ID_e) { dComIfGp_event_setItemPartnerId(item_partner_id); } @@ -2116,7 +2130,7 @@ int daAlink_c::procCoGetItemInit() { } current.angle.y = shape_angle.y; - mMsgClassID = -1; + mMsgClassID = fpcM_ERROR_PROCESS_ID_e; mProcVar0.field_0x3008 = 0; field_0x3198 = 0; field_0x32cc = 0; @@ -2283,7 +2297,7 @@ int daAlink_c::procCoGetItem() { dComIfGs_isItemFirstBit(mProcVar2.field_0x300c)) { field_0x32cc += 2000; - mMsgClassID = -1; + mMsgClassID = fpcM_ERROR_PROCESS_ID_e; return 1; } @@ -2293,7 +2307,7 @@ int daAlink_c::procCoGetItem() { } field_0x32cc += 0x5DC; - mMsgClassID = -1; + mMsgClassID = fpcM_ERROR_PROCESS_ID_e; return 1; } } @@ -2306,7 +2320,7 @@ int daAlink_c::procCoGetItem() { if (checkWolf()) { setBlendWolfMoveAnime(daAlinkHIO_wlMove_c0::m.field_0x94); } else { - if (mEquipItem == KANTERA) { + if (mEquipItem == fpcNm_ITEM_KANTERA) { field_0x2f94 = 0; } @@ -2624,9 +2638,8 @@ int daAlink_c::procMonkeyMoveInit() { current.angle.y = shape_angle.y; setSpecialGravity(0.0f, maxFallSpeed, 0); - f32 tmp_0 = 0.0f; - speed.y = tmp_0; - mNormalSpeed = tmp_0; + speed.y = 0.0f; + mNormalSpeed = 0.0f; deleteEquipItem(FALSE, FALSE); if (!checkWolf()) { @@ -2655,7 +2668,7 @@ int daAlink_c::procDemoBoomerangCatchInit() { mNormalSpeed = 0.0f; deleteEquipItem(FALSE, FALSE); - mEquipItem = BOOMERANG; + mEquipItem = fpcNm_ITEM_BOOMERANG; setItemActor(); setSingleAnimeParam(ANM_BOOMERANG_CATCH, &daAlinkHIO_boom_c0::m.mCatchAnm); return 1; @@ -2964,10 +2977,9 @@ int daAlink_c::procCoCaughtInit() { onModeFlg(0x40000); } - f32 tmp_0 = 0.0f; - mNormalSpeed = tmp_0; - speed.y = tmp_0; - setSpecialGravity(tmp_0, maxFallSpeed, 0); + mNormalSpeed = 0.0f; + speed.y = 0.0f; + setSpecialGravity(0.0f, maxFallSpeed, 0); mBodyAngle.z = 0; return 1; } @@ -3311,7 +3323,7 @@ int daAlink_c::procCoGetReadySitInit() { return 1; } - if (mEquipItem != NO_ITEM && !checkWolf()) { + if (mEquipItem != fpcNm_ITEM_NONE && !checkWolf()) { return procPreActionUnequipInit(PROC_GET_READY_SIT, NULL); } @@ -3453,10 +3465,9 @@ int daAlink_c::procZoraMoveInit() { } setSingleAnimeBase(ANM_HORSE_TAME_WAIT_B); - f32 tmp_0 = 0.0f; - speed.y = tmp_0; - mNormalSpeed = tmp_0; - setSpecialGravity(tmp_0, maxFallSpeed, 0); + speed.y = 0.0f; + mNormalSpeed = 0.0f; + setSpecialGravity(0.0f, maxFallSpeed, 0); deleteEquipItem(FALSE, TRUE); mProcVar4.field_0x3010 = 5000; @@ -3646,8 +3657,8 @@ int daAlink_c::procTradeItemOut() { /* 8011E3D8-8011E448 118D18 0070+00 2/2 0/0 0/0 .text checkLetterItem__9daAlink_cFi */ BOOL daAlink_c::checkLetterItem(int i_itemNo) { - return i_itemNo == LETTER || i_itemNo == BILL || i_itemNo == RAFRELS_MEMO || - i_itemNo == TKS_LETTER || i_itemNo == ASHS_SCRIBBLING; + return i_itemNo == fpcNm_ITEM_LETTER || i_itemNo == fpcNm_ITEM_BILL || i_itemNo == fpcNm_ITEM_RAFRELS_MEMO || + i_itemNo == fpcNm_ITEM_TKS_LETTER || i_itemNo == fpcNm_ITEM_ASHS_SCRIBBLING; } /* 8011E448-8011E57C 118D88 0134+00 1/1 0/0 0/0 .text procNotUseItemInit__9daAlink_cFi */ @@ -3661,7 +3672,7 @@ int daAlink_c::procNotUseItemInit(int param_0) { setSingleAnimeBase(ANM_TRADE_ITEM_PULL_OUT); mNormalSpeed = 0.0f; - mMsgClassID = -1; + mMsgClassID = fpcM_ERROR_PROCESS_ID_e; field_0x3198 = param_0; mProcVar2.field_0x300c = 0; mProcVar3.field_0x300e = 0; @@ -3684,7 +3695,7 @@ int daAlink_c::procNotUseItemInit(int param_0) { /* 8011E57C-8011E6E0 118EBC 0164+00 1/0 0/0 0/0 .text procNotUseItem__9daAlink_cFv */ int daAlink_c::procNotUseItem() { if (mProcVar2.field_0x300c == 0) { - u32 item_partner_id = fopAcM_createItemForPresentDemo( + fpc_ProcID item_partner_id = fopAcM_createItemForPresentDemo( ¤t.pos, field_0x3198, 5, -1, fopAcM_GetRoomNo(this), &shape_angle, &scale); dComIfGp_event_setItemPartnerId(item_partner_id); mProcVar2.field_0x300c = 1; @@ -3821,9 +3832,8 @@ int daAlink_c::procGanonFinishInit() { setSingleAnimeBase(ANM_GANON_FINISH); - f32 tmp_0 = 0.0f; - mNormalSpeed = tmp_0; - speed.y = tmp_0; + mNormalSpeed = 0.0f; + speed.y = 0.0f; field_0x37c8 = current.pos; onEndResetFlg1(ERFLG1_GANON_FINISH); @@ -3944,8 +3954,8 @@ int daAlink_c::procDungeonWarpReadyInit() { return 0; } - u32 id; - if (checkItemSetButton(DUNGEON_EXIT) != 2) { + fpc_ProcID id; + if (checkItemSetButton(fpcNm_ITEM_DUNGEON_EXIT) != 2) { id = fopAcM_create(PROC_OBJ_TKS, 0, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1); } else { @@ -3953,7 +3963,7 @@ int daAlink_c::procDungeonWarpReadyInit() { NULL, -1); } - if (id == -1) { + if (id == fpcM_ERROR_PROCESS_ID_e) { return 0; } @@ -4038,7 +4048,7 @@ int daAlink_c::procDungeonWarp() { if (scale.x < 0.01f) { onNoResetFlg0(FLG0_PLAYER_NO_DRAW); - if (checkItemGet(DUNGEON_EXIT, 1)) { + if (checkItemGet(fpcNm_ITEM_DUNGEON_EXIT, 1)) { int escape = dStage_stagInfo_GetEscapeWarp(dComIfGp_getStage()->getStagInfo()); dStage_changeScene(escape, 0.0f, 12, -1, shape_angle.y, -1); @@ -4344,11 +4354,11 @@ int daAlink_c::procCoWarpInit(int param_0, int param_1) { } } - if (checkItemGet(DUNGEON_EXIT, 1) || - (checkItemGet(DUNGEON_BACK, 1) && + if (checkItemGet(fpcNm_ITEM_DUNGEON_EXIT, 1) || + (checkItemGet(fpcNm_ITEM_DUNGEON_BACK, 1) && strcmp(sp8, dComIfGs_getWarpStageName()) == 0)) { - dComIfGs_setItem(SLOT_18, NO_ITEM); + dComIfGs_setItem(SLOT_18, fpcNm_ITEM_NONE); dComIfGs_resetLastWarpAcceptStage(); } } @@ -4409,7 +4419,7 @@ int daAlink_c::procCoWarp() { setSpecialGravity(var_f1, maxFallSpeed, 1); } - if (mDemo.getDemoMode() == 0x2D) { + if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_45_e) { if (mProcVar5.field_0x3012 == 0) { mProcVar5.field_0x3012 = 1; } @@ -4435,7 +4445,7 @@ int daAlink_c::procCoWarp() { mProcVar0.field_0x3008--; } else if (warpModelTexScroll()) { if (mProcVar2.field_0x300c != 0) { - if (mDemo.getDemoMode() == 0x2D) { + if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_45_e) { if (mProcVar1.field_0x300a != 0) { if (field_0x3174 == 4) { dComIfGp_setNextStage(dComIfGp_getStartStageName(), mProcVar4.field_0x3010, diff --git a/src/d/actor/d_a_alink_effect.inc b/src/d/actor/d_a_alink_effect.inc index 0b4b4b5337..777e630c42 100644 --- a/src/d/actor/d_a_alink_effect.inc +++ b/src/d/actor/d_a_alink_effect.inc @@ -1495,7 +1495,7 @@ void daAlink_c::resetFairyEffect() { /* 80124BA4-80124E28 11F4E4 0284+00 1/1 0/0 0/0 .text setBottleEffect__9daAlink_cFv */ void daAlink_c::setBottleEffect() { - if (mEquipItem == FAIRY) { + if (mEquipItem == fpcNm_ITEM_FAIRY) { if (mpHookTipModel != NULL) { cXyz sp2C; mDoMtx_multVecZero(mpHookTipModel->getAnmMtx(2), &sp2C); @@ -1507,7 +1507,7 @@ void daAlink_c::setBottleEffect() { setEmitter(&field_0x325c, 0x734, &sp2C, NULL); } - } else if (mEquipItem == CHUCHU_RARE && mProcID == PROC_BOTTLE_GET) { + } else if (mEquipItem == fpcNm_ITEM_CHUCHU_RARE && mProcID == PROC_BOTTLE_GET) { if (field_0x072c != NULL && field_0x072c->getFrame() < 2.0f) { cXyz sp20; mDoMtx_multVec(mHeldItemModel->getAnmMtx(0), &chuchuLocalOffset, &sp20); @@ -1517,7 +1517,7 @@ void daAlink_c::setBottleEffect() { temp_r3_2->setGlobalScale(chuchuScale); } } - } else if (mProcID == PROC_BOTTLE_OPEN && mProcVar3.field_0x300e != 0 && mEquipItem == WATER_BOTTLE) { + } else if (mProcID == PROC_BOTTLE_OPEN && mProcVar3.field_0x300e != 0 && mEquipItem == fpcNm_ITEM_WATER_BOTTLE) { JPABaseEmitter* temp_r3_3 = setEmitter(&field_0x325c, 0x344, ¤t.pos, NULL); if (temp_r3_3 != NULL) { temp_r3_3->setGlobalRTMatrix(mHeldItemModel->getBaseTRMtx()); diff --git a/src/d/actor/d_a_alink_grab.inc b/src/d/actor/d_a_alink_grab.inc index adeb8cf8fe..3b0e486e9c 100644 --- a/src/d/actor/d_a_alink_grab.inc +++ b/src/d/actor/d_a_alink_grab.inc @@ -85,7 +85,7 @@ BOOL daAlink_c::exchangeGrabActor(fopAc_ac_c* p_actor) { /* 800E3A9C-800E3BCC 0DE3DC 0130+00 1/0 0/0 0/0 .text setForceGrab__9daAlink_cFP10fopAc_ac_cii */ BOOL daAlink_c::setForceGrab(fopAc_ac_c* p_actor, int param_1, int param_2) { if (((param_1 != 0 || !checkEventRun()) && !checkWolf()) && - (((mEquipItem == NO_ITEM || (param_2 != 0 && checkHookshotItem(mEquipItem)))) && + (((mEquipItem == fpcNm_ITEM_NONE || (param_2 != 0 && checkHookshotItem(mEquipItem)))) && ((checkModeFlg(MODE_UNK_10000000) && (checkHorseNoUpperAnime() || checkHorseTurnAnime())) || param_2 != 0 && checkHookshotAnime()))) @@ -723,7 +723,7 @@ int daAlink_c::procGrabReadyInit() { return checkWaitAction(); } - if (mEquipItem != NO_ITEM) { + if (mEquipItem != fpcNm_ITEM_NONE) { return procPreActionUnequipInit(PROC_GRAB_READY, field_0x27f4); } @@ -1210,7 +1210,7 @@ int daAlink_c::procInsectCatchInit() { return checkWaitAction(); } - if (mEquipItem != NO_ITEM) { + if (mEquipItem != fpcNm_ITEM_NONE) { return procPreActionUnequipInit(PROC_INSECT_CATCH, field_0x27f4); } @@ -1252,7 +1252,7 @@ int daAlink_c::procPickUpInit() { return checkWaitAction(); } - if (mEquipItem != NO_ITEM) { + if (mEquipItem != fpcNm_ITEM_NONE) { return procPreActionUnequipInit(PROC_PICK_UP, field_0x27f4); } @@ -1323,7 +1323,7 @@ int daAlink_c::procPickUp() { onResetFlg0(RFLG0_UNK_8000); if (mProcVar4.field_0x3010 != 0) { - mEquipItem = KANTERA; + mEquipItem = fpcNm_ITEM_KANTERA; setKandelaarModel(); } } @@ -1345,7 +1345,7 @@ int daAlink_c::procPickUp() { /* 800E75EC-800E76E0 0E1F2C 00F4+00 3/3 0/0 0/0 .text procPickPutInit__9daAlink_cFi */ int daAlink_c::procPickPutInit(int param_0) { - if (param_0 != 0 && mEquipItem != NO_ITEM) { + if (param_0 != 0 && mEquipItem != fpcNm_ITEM_NONE) { return procPreActionUnequipInit(PROC_PICK_PUT, NULL); } @@ -1363,7 +1363,7 @@ int daAlink_c::procPickPutInit(int param_0) { mProcVar2.field_0x300c = param_0; if (mProcVar2.field_0x300c != 0) { - mEquipItem = POKE_BOMB; + mEquipItem = fpcNm_ITEM_POKE_BOMB; } else { onResetFlg0(RFLG0_GRAB_PUT_START); } @@ -1397,7 +1397,7 @@ int daAlink_c::procPickPut() { dComIfGp_addSelectItemNum(mSelectItemId, -1); field_0x2fcf++; } - mEquipItem = NO_ITEM; + mEquipItem = fpcNm_ITEM_NONE; } else { field_0x3198 = 0; temp_r3->speedF = 0.0f; @@ -1490,7 +1490,7 @@ bool daAlink_c::checkChainBlockPushPull() { /* 800E7C30-800E7CC0 0E2570 0090+00 2/2 0/0 0/0 .text procFmChainUpInit__9daAlink_cFv */ int daAlink_c::procFmChainUpInit() { - if (mEquipItem != NO_ITEM) { + if (mEquipItem != fpcNm_ITEM_NONE) { return procPreActionUnequipInit(PROC_CHAIN_UP, NULL); } @@ -1722,7 +1722,7 @@ f32 daAlink_c::getPushPullAnimeSpeed() { /* 800E8428-800E857C 0E2D68 0154+00 4/4 0/0 0/0 .text procCoPushPullWaitInit__9daAlink_cFi */ int daAlink_c::procCoPushPullWaitInit(int param_0) { - if (mEquipItem != NO_ITEM) { + if (mEquipItem != fpcNm_ITEM_NONE) { return procPreActionUnequipInit(PROC_PUSH_PULL_WAIT, NULL); } @@ -2518,7 +2518,7 @@ int daAlink_c::procGoatCatch() { /* 800EA2A8-800EA3AC 0E4BE8 0104+00 2/2 0/0 0/0 .text procGoatStrokeInit__9daAlink_cFv */ int daAlink_c::procGoatStrokeInit() { - if (mEquipItem != NO_ITEM) { + if (mEquipItem != fpcNm_ITEM_NONE) { return procPreActionUnequipInit(PROC_GOAT_STROKE, field_0x27f4); } @@ -2552,7 +2552,7 @@ int daAlink_c::procGoatStroke() { /* 800EA3F4-800EA4CC 0E4D34 00D8+00 2/2 0/0 0/0 .text procGoronMoveInit__9daAlink_cFv */ int daAlink_c::procGoronMoveInit() { - if (mEquipItem != NO_ITEM) { + if (mEquipItem != fpcNm_ITEM_NONE) { return procPreActionUnequipInit(PROC_GORON_MOVE, NULL); } @@ -2594,7 +2594,7 @@ int daAlink_c::procGoronMove() { current.angle.y = shape_angle.y + 0x4000; } - if (checkSetItemTrigger(HVY_BOOTS)) { + if (checkSetItemTrigger(fpcNm_ITEM_HVY_BOOTS)) { return procBootsEquipInit(); } diff --git a/src/d/actor/d_a_alink_guard.inc b/src/d/actor/d_a_alink_guard.inc index 118ab1b12d..c549fd068b 100644 --- a/src/d/actor/d_a_alink_guard.inc +++ b/src/d/actor/d_a_alink_guard.inc @@ -63,8 +63,8 @@ void daAlink_c::stickArrowIncrement(int param_0) { } if (arrow_num != 0) { - if (i_checkShieldGet() && checkItemGet(BOW, true)) { - int arrow_type = arrow_num == 1 ? ARROW_1 : ARROW_10; + if (i_checkShieldGet() && checkItemGet(fpcNm_ITEM_BOW, true)) { + int arrow_type = arrow_num == 1 ? fpcNm_ITEM_ARROW_1 : fpcNm_ITEM_ARROW_10; dComIfGp_setItemArrowNumCount(arrow_num); fopAcM_createItemForSimpleDemo(¤t.pos, arrow_type, -1, NULL, NULL, 0.0f, @@ -107,7 +107,7 @@ void daAlink_c::setArrowShieldActor(fopAc_ac_c* i_actor, int param_1) { field_0x2f7c[i] = 10; dComIfGp_setItemArrowNumCount(1); - fopAcM_createItemForSimpleDemo(¤t.pos, ARROW_10, -1, NULL, NULL, 0.0f, 0.0f); + fopAcM_createItemForSimpleDemo(¤t.pos, fpcNm_ITEM_ARROW_10, -1, NULL, NULL, 0.0f, 0.0f); } if (param_1 && field_0x2fcb == 0 && !checkMagicArmorNoDamage()) { @@ -198,7 +198,7 @@ void daAlink_c::setUpperGuardAnime(f32) { /* 800DD018-800DD114 0D7958 00FC+00 1/1 0/0 0/0 .text setShieldGuard__9daAlink_cFv */ void daAlink_c::setShieldGuard() { - if ((mProcID == PROC_GUARD_SLIP && mEquipItem != IRONBALL) || checkSmallUpperGuardAnime() || + if ((mProcID == PROC_GUARD_SLIP && mEquipItem != fpcNm_ITEM_IRONBALL) || checkSmallUpperGuardAnime() || (checkGuardAccept() && !checkGrabAnime() && !checkUpperReadyThrowAnime() && !checkDkCaught2Anime() && !checkKandelaarSwingAnime() && !checkCutDashAnime() && !checkCutDashChargeAnime() && (!checkEquipAnime() || checkUpperGuardAnime()) && @@ -270,7 +270,7 @@ int daAlink_c::procGuardSlipInit(int param_0, dCcD_GObjInf* param_1) { cXyz* temp_r3 = getDamageVec(param_1); current.angle.y = temp_r3->atan2sX_Z(); - if (mEquipItem == IRONBALL) { + if (mEquipItem == fpcNm_ITEM_IRONBALL) { setSingleAnimeBase(ANM_IRONBALL_DEF); setIronBallWaitUpperAnime(1); mNowAnmPackUpper[2].setRatio(0.0f); @@ -339,7 +339,7 @@ int daAlink_c::procGuardSlipInit(int param_0, dCcD_GObjInf* param_1) { /* 800DD894-800DDA10 0D81D4 017C+00 1/0 0/0 0/0 .text procGuardSlip__9daAlink_cFv */ int daAlink_c::procGuardSlip() { - if (mEquipItem != IRONBALL) { + if (mEquipItem != fpcNm_ITEM_IRONBALL) { setUpperGuardAnime(-1.0f); } @@ -373,7 +373,7 @@ int daAlink_c::procGuardSlip() { onEndResetFlg1(ERFLG1_UNK_20); } - if (mEquipItem == IRONBALL) { + if (mEquipItem == fpcNm_ITEM_IRONBALL) { mNowAnmPackUpper[2].setRatio(1.0f); } @@ -513,7 +513,7 @@ int daAlink_c::procGuardBreakInit() { commonProcInit(PROC_GUARD_BREAK); setSingleAnimeParam(ANM_GUARD_BREAK, &daAlinkHIO_guard_c0::m.mGuardBreakAnm); - if (mEquipItem == IRONBALL) { + if (mEquipItem == fpcNm_ITEM_IRONBALL) { deleteEquipItem(0, 0); } diff --git a/src/d/actor/d_a_alink_hang.inc b/src/d/actor/d_a_alink_hang.inc index fc2518b0fa..1483d4cf50 100644 --- a/src/d/actor/d_a_alink_hang.inc +++ b/src/d/actor/d_a_alink_hang.inc @@ -820,7 +820,7 @@ int daAlink_c::procHangWallCatch() { /* 800FC178-800FC240 0F6AB8 00C8+00 4/4 0/0 0/0 .text procHangReadyInit__9daAlink_cFv */ int daAlink_c::procHangReadyInit() { - if (field_0x2f91 == 3 && mEquipItem != NO_ITEM) { + if (field_0x2f91 == 3 && mEquipItem != fpcNm_ITEM_NONE) { return procPreActionUnequipInit(0x5C, NULL); } else if (mProcID == PROC_PREACTION_UNEQUIP) { setFrontWallType(); @@ -870,7 +870,7 @@ int daAlink_c::procHangReady() { /* 800FC2F4-800FC390 0F6C34 009C+00 2/2 0/0 0/0 .text procHangLeverDownInit__9daAlink_cFv */ int daAlink_c::procHangLeverDownInit() { - if (mEquipItem != NO_ITEM) { + if (mEquipItem != fpcNm_ITEM_NONE) { return procPreActionUnequipInit(PROC_HANG_LEVER_DOWN, field_0x27f4); } @@ -1373,7 +1373,7 @@ int daAlink_c::checkLadderFall() { /* 800FD648-800FD7B0 0F7F88 0168+00 2/2 0/0 0/0 .text procLadderUpStartInit__9daAlink_cFv */ int daAlink_c::procLadderUpStartInit() { - if (mEquipItem != NO_ITEM) { + if (mEquipItem != fpcNm_ITEM_NONE) { return procPreActionUnequipInit(PROC_LADDER_UP_START, NULL); } @@ -1479,7 +1479,7 @@ int daAlink_c::procLadderUpEnd() { int daAlink_c::procLadderDownStartInit() { onNoResetFlg3(FLG3_UNK_400000); - if (mEquipItem != NO_ITEM) { + if (mEquipItem != fpcNm_ITEM_NONE) { return procPreActionUnequipInit(PROC_LADDER_DOWN_START, NULL); } diff --git a/src/d/actor/d_a_alink_hook.inc b/src/d/actor/d_a_alink_hook.inc index 65aad5148a..4fb82bb9b7 100644 --- a/src/d/actor/d_a_alink_hook.inc +++ b/src/d/actor/d_a_alink_hook.inc @@ -313,7 +313,7 @@ void daAlink_c::cancelHookshotCarry() { /* 80108864-801088A0 1031A4 003C+00 2/2 0/0 0/0 .text changeHookshotDrawModel__9daAlink_cFv */ void daAlink_c::changeHookshotDrawModel() { - if (mEquipItem == HOOKSHOT && field_0x3020 == 1) { + if (mEquipItem == fpcNm_ITEM_HOOKSHOT && field_0x3020 == 1) { J3DModel* old_item = mHeldItemModel; mHeldItemModel = field_0x0710; field_0x0710 = old_item; @@ -432,7 +432,7 @@ void daAlink_c::setHookshotModel() { resetHookshotMode(); mpHookChain->setUserArea((u32)this); field_0x2f94 = 1; - if (mEquipItem == W_HOOKSHOT) { + if (mEquipItem == fpcNm_ITEM_W_HOOKSHOT) { field_0x2f95 = 6; } @@ -1386,7 +1386,7 @@ int daAlink_c::checkLandHookshotHang() { ((mProcID != PROC_HOOKSHOT_ROOF_SHOOT && mProcID != PROC_HOOKSHOT_WALL_SHOOT) || checkHookshotWait()) && (!checkHookshotRoofLv7Boss() || !checkEquipHeavyBoots()) && - checkSetItemTrigger(HVY_BOOTS)) + checkSetItemTrigger(fpcNm_ITEM_HVY_BOOTS)) { if (dComIfGp_checkPlayerStatus1(0, 0x10000)) { return procHookshotRoofBootsInit(mCargoCarryAcKeep.getActor()); @@ -1615,7 +1615,7 @@ int daAlink_c::procHookshotFly() { } current.pos += field_0x37d4; - if (checkSetItemTrigger(W_HOOKSHOT) != 0) { + if (checkSetItemTrigger(fpcNm_ITEM_W_HOOKSHOT) != 0) { mProcVar5.field_0x3012 = 1; } else if (mProcVar5.field_0x3012 != 0 && !itemButton()) { mProcVar5.field_0x3012 = 0; @@ -1804,7 +1804,7 @@ int daAlink_c::procHookshotRoofWait() { setShapeAngleToAtnActor(0); if (mProcVar2.field_0x300c == 0) { - if (checkSetItemTrigger(W_HOOKSHOT)) { + if (checkSetItemTrigger(fpcNm_ITEM_W_HOOKSHOT)) { mProcVar5.field_0x3012 = 1; } else if (mProcVar5.field_0x3012 != 0 && !itemButton()) { mProcVar5.field_0x3012 = 0; @@ -1819,7 +1819,7 @@ int daAlink_c::procHookshotRoofWait() { mProcVar2.field_0x300c = 1; } } else if (!checkHookshotRoofLv7Boss()) { - if (checkSetItemTrigger(W_HOOKSHOT) || mProcVar5.field_0x3012 != 0) { + if (checkSetItemTrigger(fpcNm_ITEM_W_HOOKSHOT) || mProcVar5.field_0x3012 != 0) { return procHookshotRoofShootInit(mCargoCarryAcKeep.getActor()); } hookshotRoofTurn(); @@ -2081,7 +2081,7 @@ int daAlink_c::procHookshotWallWait() { } if (mProcVar2.field_0x300c == 0) { - if (checkSetItemTrigger(W_HOOKSHOT)) { + if (checkSetItemTrigger(fpcNm_ITEM_W_HOOKSHOT)) { mProcVar5.field_0x3012 = 1; } else if (mProcVar5.field_0x3012 != 0 && !itemButton()) { mProcVar5.field_0x3012 = 0; @@ -2095,7 +2095,7 @@ int daAlink_c::procHookshotWallWait() { setHookshotWallWaitAnime(); mProcVar2.field_0x300c = 1; } - } else if (checkSetItemTrigger(W_HOOKSHOT) || mProcVar5.field_0x3012 != 0) { + } else if (checkSetItemTrigger(fpcNm_ITEM_W_HOOKSHOT) || mProcVar5.field_0x3012 != 0) { return procHookshotWallShootInit(); } diff --git a/src/d/actor/d_a_alink_horse.inc b/src/d/actor/d_a_alink_horse.inc index 9fcc6e3b20..908b6c0d76 100644 --- a/src/d/actor/d_a_alink_horse.inc +++ b/src/d/actor/d_a_alink_horse.inc @@ -194,7 +194,7 @@ void daAlink_c::rideGetOff() { seStartOnlyReverb(Z2SE_AL_SPINNER_END); } else if (checkCanoeRide()) { if (mEquipItem == 0x10B) { - mEquipItem = NO_ITEM; + mEquipItem = fpcNm_ITEM_NONE; } } else if (checkBoardRide()) { static_cast(mRideAcKeep.getActor())->offRide(); @@ -1224,7 +1224,7 @@ int daAlink_c::checkHorseGetOffAndSetDoStatus() { setDoStatus(0x8C); } } else if ((checkHorseNoUpperAnime() || checkEquipAnime()) && mMidnaTalkDelayTimer == 0 && !checkInputOnR() && temp_r28) { - if (mEquipItem == NO_ITEM) { + if (mEquipItem == fpcNm_ITEM_NONE) { var_r30 = checkHorseGetOffDirection(); if ((var_r30 != DIR_LEFT || (checkHorseRide() && temp_r29->checkEnemySearch())) && field_0x2fb4 == 0) { if (!checkSpecialHorseRide()) { @@ -1265,7 +1265,7 @@ int daAlink_c::setHorseGetOff(int param_0) { int daAlink_c::procHorseRideInit() { BOOL var_r25 = 0; - if (mEquipItem != NO_ITEM) { + if (mEquipItem != fpcNm_ITEM_NONE) { if (mEquipItem == 0x103) { var_r25 = 1; } @@ -1524,7 +1524,7 @@ int daAlink_c::procHorseGetOffInit(int param_0) { commonProcInit(PROC_HORSE_GETOFF); resetUnderAnime(UNDER_2, -1.0f); - if (mEquipItem != NO_ITEM) { + if (mEquipItem != fpcNm_ITEM_NONE) { allUnequip(0); } diff --git a/src/d/actor/d_a_alink_ironball.inc b/src/d/actor/d_a_alink_ironball.inc index c455495438..7551872a8a 100644 --- a/src/d/actor/d_a_alink_ironball.inc +++ b/src/d/actor/d_a_alink_ironball.inc @@ -8,7 +8,7 @@ /* 8011243C-80112458 10CD7C 001C+00 1/0 0/0 0/0 .text getIronBallCenterPos__9daAlink_cFv */ cXyz* daAlink_c::getIronBallCenterPos() { - if (mEquipItem == IRONBALL) { + if (mEquipItem == fpcNm_ITEM_IRONBALL) { return &mIronBallCenterPos; } @@ -17,7 +17,7 @@ cXyz* daAlink_c::getIronBallCenterPos() { /* 80112458-80112474 10CD98 001C+00 1/0 0/0 0/0 .text getIronBallBgHit__9daAlink_cCFv */ int daAlink_c::getIronBallBgHit() const { - if (mEquipItem == IRONBALL) { + if (mEquipItem == fpcNm_ITEM_IRONBALL) { return field_0x301c; } @@ -26,26 +26,26 @@ int daAlink_c::getIronBallBgHit() const { /* 80112474-801124B4 10CDB4 0040+00 0/0 2/2 1/1 .text checkIronBallThrowMode__9daAlink_cCFv */ bool daAlink_c::checkIronBallThrowMode() const { - return mEquipItem == IRONBALL && + return mEquipItem == fpcNm_ITEM_IRONBALL && (mItemVar0.field_0x3018 == 4 || mItemVar0.field_0x3018 == 5 || mItemVar0.field_0x3018 == 6 || mItemVar0.field_0x3018 == 3); } /* 801124B4-801124FC 10CDF4 0048+00 0/0 1/1 1/1 .text checkIronBallThrowReturnMode__9daAlink_cCFv */ bool daAlink_c::checkIronBallThrowReturnMode() const { - return mEquipItem == IRONBALL && (mItemVar0.field_0x3018 == 4 || mItemVar0.field_0x3018 == 5 || mItemVar0.field_0x3018 == 6 || + return mEquipItem == fpcNm_ITEM_IRONBALL && (mItemVar0.field_0x3018 == 4 || mItemVar0.field_0x3018 == 5 || mItemVar0.field_0x3018 == 6 || mItemVar0.field_0x3018 == 7 || mItemVar0.field_0x3018 == 3); } /* 801124FC-80112524 10CE3C 0028+00 1/0 0/0 0/0 .text checkIronBallReturn__9daAlink_cCFv */ bool daAlink_c::checkIronBallReturn() const { - return mEquipItem == IRONBALL && mItemVar0.field_0x3018 == 7; + return mEquipItem == fpcNm_ITEM_IRONBALL && mItemVar0.field_0x3018 == 7; } /* 80112524-80112568 10CE64 0044+00 1/0 0/0 0/0 .text checkIronBallGroundStop__9daAlink_cCFv */ bool daAlink_c::checkIronBallGroundStop() const { - return mEquipItem == IRONBALL && mItemVar0.field_0x3018 != 0 && mItemVar0.field_0x3018 != 8 && field_0x301e == 0 && + return mEquipItem == fpcNm_ITEM_IRONBALL && mItemVar0.field_0x3018 != 0 && mItemVar0.field_0x3018 != 8 && field_0x301e == 0 && field_0x301e < 10; } @@ -1033,7 +1033,7 @@ int daAlink_c::procIronBallThrowInit() { int daAlink_c::procIronBallThrow() { daPy_frameCtrl_c* temp_r29 = &mUnderFrameCtrl[0]; - if (mEquipItem != IRONBALL) { + if (mEquipItem != fpcNm_ITEM_IRONBALL) { return checkWaitAction(); } @@ -1093,7 +1093,7 @@ int daAlink_c::procIronBallReturnInit() { int daAlink_c::procIronBallReturn() { daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; - if (mEquipItem != IRONBALL) { + if (mEquipItem != fpcNm_ITEM_IRONBALL) { return checkWaitAction(); } diff --git a/src/d/actor/d_a_alink_kandelaar.inc b/src/d/actor/d_a_alink_kandelaar.inc index fd030629e8..451f5aacc8 100644 --- a/src/d/actor/d_a_alink_kandelaar.inc +++ b/src/d/actor/d_a_alink_kandelaar.inc @@ -73,7 +73,7 @@ BOOL daAlink_c::checkWaterInKandelaarOffset(f32 param_0) { */ void daAlink_c::checkWaterInKandelaar(f32 param_0) { if (checkNoResetFlg2(FLG2_UNK_1) && checkWaterInKandelaarOffset(param_0)) { - if (mEquipItem == KANTERA) { + if (mEquipItem == fpcNm_ITEM_KANTERA) { deleteEquipItem(TRUE, TRUE); } else { offKandelaarModel(); @@ -92,7 +92,7 @@ void daAlink_c::offKandelaarModel() { /* 8011087C-801108B4 10B1BC 0038+00 1/0 0/0 0/0 .text checkUseKandelaar__9daAlink_cFi */ bool daAlink_c::checkUseKandelaar(int param_0) { return (param_0 == 0 && checkNoResetFlg2(FLG2_UNK_1)) || - (param_0 != 0 && mEquipItem == KANTERA); + (param_0 != 0 && mEquipItem == fpcNm_ITEM_KANTERA); } /* 801108B4-801108EC 10B1F4 0038+00 1/0 0/0 0/0 .text checkKandelaarSwing__9daAlink_cCFi @@ -256,7 +256,7 @@ void daAlink_c::resetOilBottleModel() { if (mProcVar3.field_0x300e != 0) { setKandelaarModel(); - mEquipItem = KANTERA; + mEquipItem = fpcNm_ITEM_KANTERA; } returnKeepItemData(); @@ -346,7 +346,7 @@ int daAlink_c::commonKandelaarPour(int param_0) { /* 8011130C-80111440 10BC4C 0134+00 1/1 0/0 0/0 .text initKandelaarSwing__9daAlink_cFv */ void daAlink_c::initKandelaarSwing() { - if (mEquipItem == KANTERA) { + if (mEquipItem == fpcNm_ITEM_KANTERA) { if (dComIfGs_getOil() != 0) { mZ2Link.getKantera().startSound(Z2SE_AL_KANTERA_SWING, 0, mVoiceReverbIntensity); } else { diff --git a/src/d/actor/d_a_alink_link.inc b/src/d/actor/d_a_alink_link.inc index ce0c03aaf9..5edba8c70a 100644 --- a/src/d/actor/d_a_alink_link.inc +++ b/src/d/actor/d_a_alink_link.inc @@ -23,7 +23,7 @@ int daAlink_c::procPreActionUnequipInit(int i_procAfter, fopAc_ac_c* param_1) { mProcVar3.field_0x300e = 1; if (fopAcM_GetName(param_1) == PROC_Tag_Lv8Gate) { - if (mEquipItem == KANTERA) { + if (mEquipItem == fpcNm_ITEM_KANTERA) { mProcVar4.field_0x3010 = 1; } else if (checkNoResetFlg2(FLG2_UNK_1)) { offKandelaarModel(); @@ -559,7 +559,7 @@ int daAlink_c::procSideStepLandInit() { field_0x2fb0 = 8; field_0x2fcc = 0; - if (checkEnemyGroup(mTargetedActor) && mEquipItem == EQUIP_SWORD && checkNoUpperAnime()) { + if (checkEnemyGroup(mTargetedActor) && mEquipItem == 0x103 && checkNoUpperAnime()) { setUpperAnimeBaseSpeed(uvar3, daAlinkHIO_atnMove_c0::m.mWaitAnmSpeed, -1.0f); seStartSwordCut(Z2SE_AL_WAIT_SWORD_SWING); } @@ -1190,7 +1190,7 @@ int daAlink_c::procBackJump() { offModeFlg(0x2000); } - if (checkCutTurnInput() && mEquipItem == EQUIP_SWORD) { + if (checkCutTurnInput() && mEquipItem == 0x103) { field_0x3198 = getCutTurnDirection(); } @@ -1247,7 +1247,7 @@ int daAlink_c::procBackJumpLand() { checkNextAction(0); } } else if (frameCtrl->getFrame() > daAlinkHIO_backJump_c0::m.mLandAnm.mCheckFrame) { - if (mEquipItem == EQUIP_SWORD && (field_0x3198 != 2 || checkCutTurnInput())) { + if (mEquipItem == 0x103 && (field_0x3198 != 2 || checkCutTurnInput())) { return procCutTurnInit(1, field_0x3198); } @@ -1448,7 +1448,7 @@ int daAlink_c::procAutoJump() { setLandPassiveData(); - if (!checkModeFlg(4) && checkSetItemTrigger(HVY_BOOTS)) { + if (!checkModeFlg(4) && checkSetItemTrigger(fpcNm_ITEM_HVY_BOOTS)) { setHeavyBoots(1); } @@ -2428,7 +2428,7 @@ int daAlink_c::execute() { shape_angle.y = field_0x3108; } - if (checkNoResetFlg2(FLG2_UNK_1) && mEquipItem != KANTERA && checkItemSetButton(KANTERA) == 2) { + if (checkNoResetFlg2(FLG2_UNK_1) && mEquipItem != fpcNm_ITEM_KANTERA && checkItemSetButton(fpcNm_ITEM_KANTERA) == 2) { offKandelaarModel(); } @@ -2439,7 +2439,7 @@ int daAlink_c::execute() { field_0x3184 = dComIfGp_evmng_getMyStaffId("Alink", this, 0); if (eventInfo.checkCommandDoor() && !dComIfGp_event_chkEventFlag(4) && - mEquipItem == noentry71) + mEquipItem == 0x102) { deleteEquipItem(FALSE, FALSE); } @@ -2515,7 +2515,7 @@ int daAlink_c::execute() { field_0x2f9d = 0; field_0x2fc1 = 6; - if (!checkSwordGet() && mEquipItem == EQUIP_SWORD) { + if (!checkSwordGet() && mEquipItem == 0x103) { deleteEquipItem(FALSE, FALSE); } @@ -2709,7 +2709,7 @@ int daAlink_c::execute() { } } - if (checkEndResetFlg0(ERFLG0_UNK_1000000) && mEquipItem == EQUIP_SWORD) { + if (checkEndResetFlg0(ERFLG0_UNK_1000000) && mEquipItem == 0x103) { mSwordFlourishTimer = daAlinkHIO_cut_c0::m.mFlourishTime; } @@ -2733,7 +2733,7 @@ int daAlink_c::execute() { } if (checkEquipHeavyBoots()) { - int temp_r3_22 = checkItemSetButton(HVY_BOOTS); + int temp_r3_22 = checkItemSetButton(fpcNm_ITEM_HVY_BOOTS); if (temp_r3_22 == 2 || checkNotHeavyBootsStage()) { if (!dComIfGp_checkPlayerStatus1(0, 0x10000) || !checkHookshotRoofLv7Boss()) { setHeavyBoots(0); @@ -2784,7 +2784,7 @@ int daAlink_c::execute() { resetUpperAnime(UPPER_2, 5.0f); } - if (mEquipItem == KANTERA && checkNoUpperAnime() && !checkKandelaarEquipAnime() && + if (mEquipItem == fpcNm_ITEM_KANTERA && checkNoUpperAnime() && !checkKandelaarEquipAnime() && (checkModeFlg(MODE_UNK_1000) || mProcID == PROC_CROUCH)) { if (checkReinRide()) { @@ -3056,7 +3056,7 @@ int daAlink_c::execute() { field_0x2fcb--; if (field_0x2fcb == 0) { - dMeter2Info_setShield(NO_ITEM, true); + dMeter2Info_setShield(fpcNm_ITEM_NONE, true); stickArrowIncrement(1); setWoodShieldBurnOutEffect(); @@ -3065,7 +3065,7 @@ int daAlink_c::execute() { stage_stag_info_class* pstag = dComIfGp_getStage()->getStagInfo(); if (dStage_stagInfo_GetSaveTbl(pstag) == 0x11 && - !dComIfGs_isItemFirstBit(HYLIA_SHIELD)) + !dComIfGs_isItemFirstBit(fpcNm_ITEM_HYLIA_SHIELD)) { fopAcM_onSwitch(this, 0x6F); } @@ -3239,8 +3239,8 @@ int daAlink_c::execute() { if (!checkWolf()) { for (u8 i = 0; i < 2; i++) { u8 tmp = (i + 1) % 2; - if (dComIfGp_getSelectItem(i) == EMPTY_BOTTLE && (field_0x2fae & (1 << i)) && - dComIfGp_getSelectItem(tmp) == EMPTY_BOTTLE) + if (dComIfGp_getSelectItem(i) == fpcNm_ITEM_EMPTY_BOTTLE && (field_0x2fae & (1 << i)) && + dComIfGp_getSelectItem(tmp) == fpcNm_ITEM_EMPTY_BOTTLE) { field_0x2fae |= (u8)(1 << tmp); } @@ -3352,7 +3352,7 @@ int daAlink_c::execute() { } if (dComIfGp_att_getCatghTarget() != NULL && !checkWolf()) { - if (!checkRideOn() && checkCastleTownUseItem(EMPTY_BOTTLE)) { + if (!checkRideOn() && checkCastleTownUseItem(fpcNm_ITEM_EMPTY_BOTTLE)) { dComIfGp_setBottleStatus(0x6C, 0); } } @@ -3541,7 +3541,7 @@ bool daAlink_c::checkShieldDraw() { /* 800CB5F8-800CB694 0C5F38 009C+00 2/2 0/0 0/0 .text checkItemDraw__9daAlink_cFv */ bool daAlink_c::checkItemDraw() { - if (mHeldItemModel != NULL && (mEquipItem != IRONBALL || !checkSwordEquipAnime())) { + if (mHeldItemModel != NULL && (mEquipItem != fpcNm_ITEM_IRONBALL || !checkSwordEquipAnime())) { if (!checkBowAndSlingItem(mEquipItem) || checkBowGrabLeftHand() || !i_checkShieldGet() || field_0x2e44.checkPassNum(15)) { @@ -3759,12 +3759,12 @@ void daAlink_c::shadowDraw() { dComIfGd_addRealShadow(var_r29, mpDemoHRTmpModel); } - if (mEquipItem == BOOMERANG) { + if (mEquipItem == fpcNm_ITEM_BOOMERANG) { if (mItemAcKeep.getActor() != NULL) { dComIfGd_addRealShadow(var_r29, mItemAcKeep.getActor()->model); } } else if (checkItemDraw()) { - if (mEquipItem == IRONBALL) { + if (mEquipItem == fpcNm_ITEM_IRONBALL) { if (mItemVar0.field_0x3018 == 0 || mItemVar0.field_0x3018 == 8) { dComIfGd_addRealShadow(var_r29, mHeldItemModel); } else { @@ -3781,7 +3781,7 @@ void daAlink_c::shadowDraw() { dComIfGd_addRealShadow(var_r29, mpHookTipModel); } - if (mEquipItem == W_HOOKSHOT && !checkPlayerGuardAndAttack() && !checkNoResetFlg0(FLG0_UNK_2)) { + if (mEquipItem == fpcNm_ITEM_W_HOOKSHOT && !checkPlayerGuardAndAttack() && !checkNoResetFlg0(FLG0_UNK_2)) { dComIfGd_addRealShadow(var_r29, field_0x0710); if (!dComIfGp_checkPlayerStatus1(0, 0x10000)) { @@ -4194,7 +4194,7 @@ int daAlink_c::draw() { modelDraw(mpHookTipModel, temp_r30); } - if (mEquipItem == W_HOOKSHOT && !checkPlayerGuardAndAttack() && + if (mEquipItem == fpcNm_ITEM_W_HOOKSHOT && !checkPlayerGuardAndAttack() && !checkNoResetFlg0(FLG0_UNK_2)) { if (field_0x0710 != NULL) { @@ -4211,7 +4211,7 @@ int daAlink_c::draw() { if (mpHookChain != NULL && !temp_r30 && ((checkHookshotItem(mEquipItem) && (mHeldItemRootPos.abs(mHookshotTopPos) > 1.0f || field_0x3810.abs(mIronBallBgChkPos) > 1.0f)) || - mEquipItem == IRONBALL)) + mEquipItem == fpcNm_ITEM_IRONBALL)) { dComIfGd_getOpaListDark()->entryImm(mpHookChain, 0); } @@ -4440,7 +4440,7 @@ BOOL daAlink_c::setBodyAngleToCamera() { } s16 var_r29; - if (!dComIfGp_checkPlayerStatus0(0, 0x202000) && mEquipItem == IRONBALL) { + if (!dComIfGp_checkPlayerStatus0(0, 0x202000) && mEquipItem == fpcNm_ITEM_IRONBALL) { var_r29 = -10000; } else { var_r29 = daAlinkHIO_item_c0::m.mItemFPUpMaxUnk; @@ -4478,7 +4478,7 @@ BOOL daAlink_c::subjectCancelTrigger() { int daAlink_c::checkSubjectEnd(BOOL i_playSound) { setDoStatus(0x12); - if (checkEventRun() || checkEquipAnime() || doTrigger() || checkSetItemTrigger(HAWK_EYE) || subjectCancelTrigger() || checkEndResetFlg0(ERFLG0_UNK_80000000) || dComIfGp_checkCameraAttentionStatus(field_0x317c, 0x2000)) { + if (checkEventRun() || checkEquipAnime() || doTrigger() || checkSetItemTrigger(fpcNm_ITEM_HAWK_EYE) || subjectCancelTrigger() || checkEndResetFlg0(ERFLG0_UNK_80000000) || dComIfGp_checkCameraAttentionStatus(field_0x317c, 0x2000)) { if (i_playSound) { seStartSystem(Z2SE_SUBJ_VIEW_OUT); } @@ -4537,7 +4537,7 @@ int daAlink_c::procCoSubjectivity() { return 1; } - if (checkSubjectEnd(FALSE) || (dComIfGp_checkPlayerStatus0(0, 0x200000) && checkSetItemTrigger(HAWK_EYE))) { + if (checkSubjectEnd(FALSE) || (dComIfGp_checkPlayerStatus0(0, 0x200000) && checkSetItemTrigger(fpcNm_ITEM_HAWK_EYE))) { seStartSystem(Z2SE_SUBJ_VIEW_OUT); checkWaitAction(); } else if (!checkWolf() && (checkItemAction() || checkItemChangeFromButton())) { @@ -4994,7 +4994,7 @@ extern "C" s32 getItemID__9daAlink_cCFv(daAlink_c* this_) { /* 800D0370-800D038C 0CACB0 001C+00 1/0 0/0 0/0 .text getGrabActorID__9daAlink_cCFv */ extern "C" s32 getGrabActorID__9daAlink_cCFv(daAlink_c* this_) { - if (this_->mEquipItem == noentry71) { + if (this_->mEquipItem == 0x102) { return this_->mItemAcKeep.getID(); } else { return this_->mGrabItemAcKeep.getID(); @@ -5063,7 +5063,7 @@ extern "C" BOOL checkElecDamage__9daAlink_cCFv(daAlink_c* this_) { /* 800D04CC-800D04F4 0CAE0C 0028+00 1/0 0/0 0/0 .text checkEmptyBottleSwing__9daAlink_cCFv */ extern "C" BOOL checkEmptyBottleSwing__9daAlink_cCFv(daAlink_c* this_) { - return this_->mEquipItem == EMPTY_BOTTLE && this_->mProcID == daAlink_c::PROC_BOTTLE_SWING; + return this_->mEquipItem == fpcNm_ITEM_EMPTY_BOTTLE && this_->mProcID == daAlink_c::PROC_BOTTLE_SWING; } /* 800D04F4-800D0508 0CAE34 0014+00 1/0 0/0 0/0 .text checkBottleSwingMode__9daAlink_cCFv @@ -5233,7 +5233,7 @@ extern "C" void onSceneChangeDead__9daAlink_cFUci(daAlink_c* this_, u8 param_0, /* 800D084C-800D0860 0CB18C 0014+00 1/0 0/0 0/0 .text checkNoEquipItem__9daAlink_cCFv */ extern "C" bool checkNoEquipItem__9daAlink_cCFv(daAlink_c* this_) { - return this_->mEquipItem == NO_ITEM; + return this_->mEquipItem == fpcNm_ITEM_NONE; } /* 800D0860-800D087C 0CB1A0 001C+00 1/0 0/0 0/0 .text getBoardCutTurnOffsetAngleY__9daAlink_cCFv @@ -5318,7 +5318,7 @@ extern "C" void setSumouGraspCancelCount__9daAlink_cFi(daAlink_c* this_, int par /* 800D0998-800D09AC 0CB2D8 0014+00 1/0 0/0 0/0 .text checkItemSwordEquip__9daAlink_cCFv */ extern "C" bool checkItemSwordEquip__9daAlink_cCFv(daAlink_c* this_) { - return this_->mEquipItem == EQUIP_SWORD; + return this_->mEquipItem == 0x103; } /* 800D09AC-800D09B4 0CB2EC 0008+00 1/0 0/0 0/0 .text getSinkShapeOffset__9daAlink_cCFv @@ -5365,7 +5365,7 @@ extern "C" void getMidnaAtnPos__9daAlink_cCFv() { /* 800D0A30-800D0A44 0CB370 0014+00 1/0 0/0 0/0 .text checkCopyRodEquip__9daAlink_cCFv */ extern "C" bool checkCopyRodEquip__9daAlink_cCFv(daAlink_c* this_) { - return this_->mEquipItem == COPY_ROD; + return this_->mEquipItem == fpcNm_ITEM_COPY_ROD; } /* 800D0A44-800D0A6C 0CB384 0028+00 1/0 0/0 0/0 .text checkCanoeFishingGetLeft__9daAlink_cCFv */ diff --git a/src/d/actor/d_a_alink_spinner.inc b/src/d/actor/d_a_alink_spinner.inc index 92bff016c4..2a1272cf78 100644 --- a/src/d/actor/d_a_alink_spinner.inc +++ b/src/d/actor/d_a_alink_spinner.inc @@ -218,7 +218,7 @@ int daAlink_c::procSpinnerWait() { return procSmallJumpInit(2); } - int itemSetBtn = checkItemSetButton(SPINNER); + int itemSetBtn = checkItemSetButton(fpcNm_ITEM_SPINNER); if (mProcVar2.field_0x300c == 0) { if (!itemButton()) { mProcVar2.field_0x300c = 1; @@ -238,7 +238,7 @@ int daAlink_c::procSpinnerWait() { mProcVar3.field_0x300e = shape_angle.y; } } else { - if (checkSetItemTrigger(SPINNER) || swordSwingTrigger() || itemSetBtn == 2) { + if (checkSetItemTrigger(fpcNm_ITEM_SPINNER) || swordSwingTrigger() || itemSetBtn == 2) { if (swordSwingTrigger()) { swordEquip(0); } diff --git a/src/d/actor/d_a_alink_swim.inc b/src/d/actor/d_a_alink_swim.inc index ed681e1d1c..b383a21870 100644 --- a/src/d/actor/d_a_alink_swim.inc +++ b/src/d/actor/d_a_alink_swim.inc @@ -15,7 +15,7 @@ BOOL daAlink_c::checkZoraWearMaskDraw() { /* 801018E4-80101934 0FC224 0050+00 1/1 0/0 0/0 .text checkAcceptUseItemInWater__9daAlink_cCFUs */ BOOL daAlink_c::checkAcceptUseItemInWater(u16 i_itemNo) const { - return i_itemNo == HVY_BOOTS || i_itemNo == WATER_BOMB || checkHookshotItem(i_itemNo); + return i_itemNo == fpcNm_ITEM_HVY_BOOTS || i_itemNo == fpcNm_ITEM_WATER_BOMB || checkHookshotItem(i_itemNo); } /* 80101934-801019B8 0FC274 0084+00 4/4 0/0 0/0 .text swimDeleteItem__9daAlink_cFv */ @@ -786,7 +786,7 @@ void daAlink_c::setSwimMoveAnime() { if (checkBootsOrArmorHeavy()) { var_r29 = ANM_SWIM_WAIT; field_0x594 = daAlinkHIO_swim_c0::m.mUnderwaterMaxSinkSpeed; - if (mEquipItem != NO_ITEM && !checkHookshotAnime()) { + if (mEquipItem != fpcNm_ITEM_NONE && !checkHookshotAnime()) { setDoStatus(4); } } @@ -958,7 +958,7 @@ int daAlink_c::procSwimUp() { setNormalSpeedF(0.0f, daAlinkHIO_swim_c0::m.mDeceleration); - if (checkSetItemTrigger(HVY_BOOTS)) { + if (checkSetItemTrigger(fpcNm_ITEM_HVY_BOOTS)) { setHeavyBoots(1); } @@ -1053,7 +1053,7 @@ int daAlink_c::procSwimWait() { setSwimUpDownOffset(); - if (checkEquipHeavyBoots() && mEquipItem != NO_ITEM) { + if (checkEquipHeavyBoots() && mEquipItem != fpcNm_ITEM_NONE) { setDoStatus(0x4); } diff --git a/src/d/actor/d_a_alink_swindow.inc b/src/d/actor/d_a_alink_swindow.inc index 856eadaf42..411aaecd55 100644 --- a/src/d/actor/d_a_alink_swindow.inc +++ b/src/d/actor/d_a_alink_swindow.inc @@ -22,11 +22,11 @@ void daAlink_c::setArcName(BOOL i_isWolf) { } inline bool checkCarvingWoodShieldEquip() { - return dComIfGs_getSelectEquipShield() == WOOD_SHIELD; + return dComIfGs_getSelectEquipShield() == fpcNm_ITEM_WOOD_SHIELD; } inline bool checkShopWoodShieldEquip() { - return dComIfGs_getSelectEquipShield() == SHIELD; + return dComIfGs_getSelectEquipShield() == fpcNm_ITEM_SHIELD; } /* 8013FF90-8013FFD8 13A8D0 0048+00 2/2 0/0 0/0 .text setShieldArcName__9daAlink_cFv */ diff --git a/src/d/actor/d_a_alink_weakfn.inc b/src/d/actor/d_a_alink_weakfn.inc index 0b1f40599d..53319db0d4 100644 --- a/src/d/actor/d_a_alink_weakfn.inc +++ b/src/d/actor/d_a_alink_weakfn.inc @@ -140,7 +140,7 @@ extern "C" void offCondition__11dEvt_info_cFUs() { /* 80141210-80141230 13BB50 0020+00 1/1 0/0 0/0 .text checkShieldGet__9daPy_py_cFv */ extern "C" BOOL checkShieldGet__9daPy_py_cFv() { - return dComIfGs_getSelectEquipShield() != NO_ITEM; + return dComIfGs_getSelectEquipShield() != fpcNm_ITEM_NONE; } /* 80141230-80141264 13BB70 0034+00 1/1 0/0 0/0 .text fopAcM_onSwitch__FPC10fopAc_ac_ci diff --git a/src/d/actor/d_a_alink_whistle.inc b/src/d/actor/d_a_alink_whistle.inc index 3009a8a353..f05a2b59b8 100644 --- a/src/d/actor/d_a_alink_whistle.inc +++ b/src/d/actor/d_a_alink_whistle.inc @@ -55,13 +55,13 @@ void daAlink_c::setHorseWhistleModel() { mHeldItemModel = initModel(loadAramBmd(0x31A, 0x3000), 0); mDoExt_setCurrentHeap(prev_heap); - mEquipItem = HORSE_FLUTE; + mEquipItem = fpcNm_ITEM_HORSE_FLUTE; field_0x2f94 = 2; } /* 80111894-801119D8 10C1D4 0144+00 2/2 0/0 0/0 .text procGrassWhistleGetInit__9daAlink_cFv */ int daAlink_c::procGrassWhistleGetInit() { - if (mEquipItem != NO_ITEM) { + if (mEquipItem != fpcNm_ITEM_NONE) { return procPreActionUnequipInit(PROC_GRASS_WHISTLE_GET, field_0x27f4); } @@ -95,7 +95,7 @@ int daAlink_c::procGrassWhistleGet() { if (frameCtrl_p->checkAnmEnd()) { procGrassWhistleWaitInit(mProcVar2.field_0x300c, mProcVar3.field_0x300e, mProcVar4.field_0x3010, mProcVar5.field_0x3012, &field_0x37c8); - } else if (mEquipItem == NO_ITEM && frameCtrl_p->getFrame() >= 9.0f) { + } else if (mEquipItem == fpcNm_ITEM_NONE && frameCtrl_p->getFrame() >= 9.0f) { setGrassWhistleModel(mProcVar2.field_0x300c); if (field_0x280c.getActor() != NULL) { @@ -133,7 +133,7 @@ int daAlink_c::procGrassWhistleWaitInit(int param_0, int param_1, int param_2, s field_0x32cc = 0x532; } else { setSingleAnimeBase(ANM_WAIT); - mKeepItem = NO_ITEM; + mKeepItem = fpcNm_ITEM_NONE; if (param_0 == 0) { field_0x3198 = 0x100; diff --git a/src/d/actor/d_a_alink_wolf.inc b/src/d/actor/d_a_alink_wolf.inc index 9e24c6dffd..dd45d17cad 100644 --- a/src/d/actor/d_a_alink_wolf.inc +++ b/src/d/actor/d_a_alink_wolf.inc @@ -9453,21 +9453,21 @@ int daAlink_c::procWolfDigThrough() { /* 8013F90C-8013FA14 13A24C 0108+00 1/1 0/0 0/0 .text setSmellSave__9daAlink_cFv */ void daAlink_c::setSmellSave() { - if (dComIfGs_getCollectSmell() == SMELL_MEDICINE) { + if (dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_MEDICINE) { dComIfGs_offEventBit(0x2F04); // OFF: Got Medicine Scent } dMsgObject_setSmellType(mProcVar5.field_0x3012); - if (mProcVar5.field_0x3012 == SMELL_MEDICINE) { + if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_MEDICINE) { dComIfGs_onEventBit(0x2F04); // ON: Got Medicine Scent - } else if (mProcVar5.field_0x3012 == SMELL_CHILDREN) { + } else if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_CHILDREN) { fopAcM_onSwitch(this, 102); - } else if (mProcVar5.field_0x3012 == SMELL_YELIA_POUCH) { + } else if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_YELIA_POUCH) { fopAcM_onSwitch(this, 103); - } else if (mProcVar5.field_0x3012 == SMELL_FISH) { + } else if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_FISH) { dComIfGs_onEventBit(0x6120); // ON: Got Reekfish scent - } else if (mProcVar5.field_0x3012 == SMELL_POH) { + } else if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_POH) { dComIfGs_onEventBit(0x6210); // ON: Got Poe scent } @@ -9502,7 +9502,7 @@ int daAlink_c::procWolfGetSmellInit() { dComIfGp_setPlayerStatus1(0, 0x4000000); mProcVar2.field_0x300c = 0; - if (dComIfGs_getCollectSmell() == NO_ITEM) { + if (dComIfGs_getCollectSmell() == fpcNm_ITEM_NONE) { field_0x3198 = 0xBBC; } else { field_0x3198 = 0xBBB; @@ -9510,9 +9510,9 @@ int daAlink_c::procWolfGetSmellInit() { field_0x319c = -1; - if (mProcVar5.field_0x3012 == SMELL_YELIA_POUCH) { + if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_YELIA_POUCH) { field_0x319c = 0x2220; - } else if (mProcVar5.field_0x3012 == SMELL_CHILDREN) { + } else if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_CHILDREN) { field_0x319c = 0x2240; } @@ -9536,7 +9536,7 @@ int daAlink_c::procWolfGetSmell() { dComIfGp_getEvent().reset(this); dComIfGp_clearPlayerStatus1(0, 0x4000000); - if (mProcVar5.field_0x3012 == SMELL_YELIA_POUCH) { + if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_YELIA_POUCH) { fopAcM_orderOtherEvent(this, "SMELL_1st", 0xFFFF, 0x400, 1); } else { fopAcM_orderOtherEvent(this, "SMELL_Child", 0xFFFF, 0x400, 1); diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index df0524a768..baa96ef665 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -500,7 +500,7 @@ void daArrow_c::setBombMoveEffect() { bool daArrow_c::checkReget() { if (field_0x7cc.ChkCoHit()) { dComIfGp_setItemArrowNumCount(1); - fopAcM_createItemForSimpleDemo(¤t.pos, ARROW_1, -1, NULL, NULL, 0.0f, 0.0f); + fopAcM_createItemForSimpleDemo(¤t.pos, fpcNm_ITEM_ARROW_1, -1, NULL, NULL, 0.0f, 0.0f); mDoAud_seStart(Z2SE_CONSUMP_ITEM_GET, 0, 0, 0); field_0x93f = 1; return true; diff --git a/src/d/actor/d_a_b_bq.cpp b/src/d/actor/d_a_b_bq.cpp index 4b4bd995e7..c841506dc5 100644 --- a/src/d/actor/d_a_b_bq.cpp +++ b/src/d/actor/d_a_b_bq.cpp @@ -1932,7 +1932,7 @@ static void demo_camera(b_bq_class* i_this) { dComIfGp_getVibration().StartShock(5, 1, cXyz(0.0f, 1.0f, 0.0f)); cXyz sp120(1.0f, 1.0f, 1.0f); - fopAcM_createItemForBoss(&i_this->field_0x5cc, UTAWA_HEART, + fopAcM_createItemForBoss(&i_this->field_0x5cc, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(a_this), &a_this->shape_angle, &sp120, 0.0f, 0.0f, -1); @@ -2510,7 +2510,7 @@ static int daB_BQ_Create(fopAc_ac_c* i_this) { if (!dComIfGs_isStageLife()) { cXyz scale(1.0f, 1.0f, 1.0f); pos.set(60.0f, 0.0f, 1778.0f); - fopAcM_createItemForBoss(&pos, UTAWA_HEART, fopAcM_GetRoomNo(i_this), + fopAcM_createItemForBoss(&pos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, &scale, 0.0f, 0.0f, -1); } diff --git a/src/d/actor/d_a_b_ds.cpp b/src/d/actor/d_a_b_ds.cpp index 6231a3c17c..fc036756e9 100644 --- a/src/d/actor/d_a_b_ds.cpp +++ b/src/d/actor/d_a_b_ds.cpp @@ -5697,7 +5697,7 @@ cPhs__Step daB_DS_c::create() { angle.x = angle.y = angle.z = 0; pos.set(-400.0f, 1775.0f, -4132.0f); - fopAcM_createItemForBoss(&pos, UTAWA_HEART, fopAcM_GetRoomNo(this), &angle, &scale, + fopAcM_createItemForBoss(&pos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(this), &angle, &scale, 0.0f, 0.0f, -1); } diff --git a/src/d/actor/d_a_b_ob.cpp b/src/d/actor/d_a_b_ob.cpp index 2203e2be5f..4a4e7dea8a 100644 --- a/src/d/actor/d_a_b_ob.cpp +++ b/src/d/actor/d_a_b_ob.cpp @@ -3015,7 +3015,7 @@ static void demo_camera(b_ob_class* i_this) { csXyz sp17C(player->shape_angle); sp17C.y += KREG_S(3) + -0x7060; - fopAcM_createItemForBoss(&a_this->eyePos, UTAWA_HEART, fopAcM_GetRoomNo(a_this), &sp17C, + fopAcM_createItemForBoss(&a_this->eyePos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(a_this), &sp17C, NULL, KREG_F(19) + 10.0f, 10.0f, -1); dComIfGp_getVibration().StartShock(5, 1, cXyz(0.0f, 1.0f, 0.0f)); } @@ -3869,7 +3869,7 @@ static int daB_OB_Create(fopAc_ac_c* i_this) { if (!dComIfGs_isStageLife()) { cXyz scale(1.0f, 1.0f, 1.0f); pos.set(-916.0f, -23954.0f, 8916.0f); - fopAcM_createItemForBoss(&pos, UTAWA_HEART, fopAcM_GetRoomNo(a_this), + fopAcM_createItemForBoss(&pos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(a_this), &a_this->shape_angle, &scale, 0.0f, 0.0f, -1); } diff --git a/src/d/actor/d_a_b_yo_ice.cpp b/src/d/actor/d_a_b_yo_ice.cpp index cdb37bb9fb..62aa791cb5 100644 --- a/src/d/actor/d_a_b_yo_ice.cpp +++ b/src/d/actor/d_a_b_yo_ice.cpp @@ -165,7 +165,7 @@ void daB_YOI_c::damage_check() { if (pos.y < 50.0f) { pos.y = 50.0f; } - fopAcM_createItem(&pos, HEART, -1, -1, NULL, NULL, 0); + fopAcM_createItem(&pos, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0); } } } @@ -205,7 +205,7 @@ void daB_YOI_c::setOperate(int param_0) { if (pos.y < 50.0f) { pos.y = 50.0f; } - fopAcM_createItem(&pos, HEART, -1, -1, NULL, NULL, 0); + fopAcM_createItem(&pos, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0); } break; case 8: diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp index 5a95005290..71b5af7910 100644 --- a/src/d/actor/d_a_demo_item.cpp +++ b/src/d/actor/d_a_demo_item.cpp @@ -75,11 +75,11 @@ void daDitem_c::actionStart() { OS_REPORT("ゲットアイテム：エフェクトライトセット＆表示スタート！\n"); } - if (m_itemNo == DUNGEON_EXIT || m_itemNo == DUNGEON_EXIT_2) { + if (m_itemNo == fpcNm_ITEM_DUNGEON_EXIT || m_itemNo == fpcNm_ITEM_DUNGEON_EXIT_2) { current.angle.y = dComIfGp_getPlayer(0)->shape_angle.y; } - if (m_itemNo == UTAWA_HEART || m_itemNo == KAKERA_HEART) { + if (m_itemNo == fpcNm_ITEM_UTAWA_HEART || m_itemNo == fpcNm_ITEM_KAKERA_HEART) { JPABaseEmitter* emitter = field_0x96c.getEmitter(); if (emitter == NULL) { dComIfGp_particle_set(0x8DE, ¤t.pos, NULL, NULL, 0xFF, &field_0x96c, -1, NULL, NULL, NULL); @@ -93,22 +93,22 @@ void daDitem_c::actionStart() { mParticleAlpha = 0xFF; } - if ((m_itemNo == ORANGE_RUPEE || m_itemNo == SILVER_RUPEE) && field_0x96c.getEmitter() == NULL) { + if ((m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) && field_0x96c.getEmitter() == NULL) { cXyz scale(0.55f, 0.55f, 0.55f); dComIfGp_particle_set(0xC14, &field_0x99c, NULL, &scale, 0xFF, &field_0x96c, -1, NULL, NULL, NULL); } - if (m_itemNo == WALLET_LV3 && field_0x96c.getEmitter() == NULL) { + if (m_itemNo == fpcNm_ITEM_WALLET_LV3 && field_0x96c.getEmitter() == NULL) { cXyz scale(1.2f, 1.2f, 1.2f); dComIfGp_particle_set(0xC14, &field_0x99c, NULL, &scale, 0xFF, &field_0x96c, -1, NULL, NULL, NULL); } - if (m_itemNo == CHUCHU_RARE && field_0x96c.getEmitter() == NULL) { + if (m_itemNo == fpcNm_ITEM_CHUCHU_RARE && field_0x96c.getEmitter() == NULL) { cXyz scale(0.8f, 0.8f, 0.8f); dComIfGp_particle_set(0xC14, &field_0x99c, NULL, &scale, 0xFF, &field_0x96c, -1, NULL, NULL, NULL); } - if ((m_itemNo == FAIRY_DROP || m_itemNo == DROP_BOTTLE) && field_0x96c.getEmitter() == NULL) { + if ((m_itemNo == fpcNm_ITEM_FAIRY_DROP || m_itemNo == fpcNm_ITEM_DROP_BOTTLE) && field_0x96c.getEmitter() == NULL) { dComIfGp_particle_set(0x8C15, &field_0x99c, NULL, NULL, 0xFF, &field_0x96c, -1, NULL, NULL, NULL); } @@ -128,7 +128,7 @@ void daDitem_c::actionEvent() { cLib_addCalc2(&mLight.mPow, mLightStrength, 0.1f, 1.0f); } - if (m_itemNo == POU_SPIRIT) { + if (m_itemNo == fpcNm_ITEM_POU_SPIRIT) { mSound.startLevelSound(Z2SE_EN_PO_SOUL, 0, -1); } @@ -137,7 +137,7 @@ void daDitem_c::actionEvent() { execItemGet(m_itemNo); } - if (m_itemNo == KAKERA_HEART) { + if (m_itemNo == fpcNm_ITEM_KAKERA_HEART) { s32 room_no = dComIfGp_roomControl_getStayNo(); if (strcmp(dComIfGp_getStartStageName(), "F_SP116") == 0 && room_no == 2) { @@ -229,7 +229,7 @@ void daDitem_c::actionEvent() { void daDitem_c::actionWaitLightEnd() { BOOL particle_hidden = TRUE; - if (m_itemNo == UTAWA_HEART || m_itemNo == KAKERA_HEART) { + if (m_itemNo == fpcNm_ITEM_UTAWA_HEART || m_itemNo == fpcNm_ITEM_KAKERA_HEART) { particle_hidden = cLib_chaseUC(&mParticleAlpha, 0, 26); JPABaseEmitter* emitter = field_0x96c.getEmitter(); @@ -402,7 +402,7 @@ void daDitem_c::settingEffectLight() { void daDitem_c::set_mtx() { mpModel->setBaseScale(scale); - if (m_itemNo != DUNGEON_EXIT && m_itemNo != DUNGEON_BACK && m_itemNo != LV7_DUNGEON_EXIT && m_itemNo != DUNGEON_EXIT_2) { + if (m_itemNo != fpcNm_ITEM_DUNGEON_EXIT && m_itemNo != fpcNm_ITEM_DUNGEON_BACK && m_itemNo != fpcNm_ITEM_LV7_DUNGEON_EXIT && m_itemNo != fpcNm_ITEM_DUNGEON_EXIT_2) { s16 var_r28 = 0xFFFF / 250; fopAcM_addAngleY(this, current.angle.y + var_r28, var_r28); } @@ -440,12 +440,12 @@ int daDitem_c::Delete() { dKy_efplight_cut(&mLight); } - if (m_itemNo == UTAWA_HEART || m_itemNo == KAKERA_HEART) { + if (m_itemNo == fpcNm_ITEM_UTAWA_HEART || m_itemNo == fpcNm_ITEM_KAKERA_HEART) { field_0x96c.remove(); field_0x980.remove(); } - if (m_itemNo == ORANGE_RUPEE || m_itemNo == SILVER_RUPEE || m_itemNo == WALLET_LV3 || m_itemNo == FAIRY_DROP || m_itemNo == DROP_BOTTLE || m_itemNo == CHUCHU_RARE) { + if (m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE || m_itemNo == fpcNm_ITEM_WALLET_LV3 || m_itemNo == fpcNm_ITEM_FAIRY_DROP || m_itemNo == fpcNm_ITEM_DROP_BOTTLE || m_itemNo == fpcNm_ITEM_CHUCHU_RARE) { field_0x96c.remove(); } @@ -478,7 +478,7 @@ int daDitem_c::create() { OS_REPORT_ERROR("ゲット用モデルのアーカイブ名がありません！[%d]\n", m_itemNo); } - m_itemNo = GREEN_RUPEE; + m_itemNo = fpcNm_ITEM_GREEN_RUPEE; } int phase_state = dComIfG_resLoad(&mPhase, dItem_data::getArcName(m_itemNo)); @@ -523,13 +523,13 @@ int daDitem_c::execute() { eyePos = current.pos; eyePos.y += mpModel->getModelData()->getJointNodePointer(0)->getMax()->y * 0.5f; - if (m_itemNo == ORANGE_RUPEE || m_itemNo == SILVER_RUPEE) { + if (m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) { field_0x99c = current.pos; field_0x99c.y += 10.0f; - } else if (m_itemNo == WALLET_LV3 || m_itemNo == CHUCHU_RARE) { + } else if (m_itemNo == fpcNm_ITEM_WALLET_LV3 || m_itemNo == fpcNm_ITEM_CHUCHU_RARE) { field_0x99c = current.pos; field_0x99c.y += 15.0f; - } else if (m_itemNo == FAIRY_DROP || m_itemNo == DROP_BOTTLE) { + } else if (m_itemNo == fpcNm_ITEM_FAIRY_DROP || m_itemNo == fpcNm_ITEM_DROP_BOTTLE) { field_0x99c = current.pos; } @@ -544,7 +544,7 @@ static int daDitem_Execute(daDitem_c* i_this) { int daDitem_c::draw() { switch (m_itemNo) { - case WOOD_STICK: + case fpcNm_ITEM_WOOD_STICK: draw_WOOD_STICK(); break; } diff --git a/src/d/actor/d_a_do.cpp b/src/d/actor/d_a_do.cpp index 590a591465..5343bb0c78 100644 --- a/src/d/actor/d_a_do.cpp +++ b/src/d/actor/d_a_do.cpp @@ -1359,15 +1359,15 @@ case1and2: if (get_item) { int item_no; if (dComIfGs_getLife() <= 4) { - item_no = HEART; + item_no = fpcNm_ITEM_HEART; } else { int rnd = cM_rndF(11.0f); if (rnd <= 5) { - item_no = HEART; + item_no = fpcNm_ITEM_HEART; } else if (rnd <= 9) { - item_no = GREEN_RUPEE; + item_no = fpcNm_ITEM_GREEN_RUPEE; } else { - item_no = BLUE_RUPEE; + item_no = fpcNm_ITEM_BLUE_RUPEE; } } diff --git a/src/d/actor/d_a_e_arrow.cpp b/src/d/actor/d_a_e_arrow.cpp index 0217a3af0a..a7cc8626d1 100644 --- a/src/d/actor/d_a_e_arrow.cpp +++ b/src/d/actor/d_a_e_arrow.cpp @@ -387,9 +387,9 @@ static void e_arrow_bg(e_arrow_class* i_this) { i_this->mMode = 1; i_this->mTimers[0] = 100; case 1: - if (checkItemGet(BOW, 1) && fopAcM_searchPlayerDistance(i_this) < 30.0f) { + if (checkItemGet(fpcNm_ITEM_BOW, 1) && fopAcM_searchPlayerDistance(i_this) < 30.0f) { dComIfGp_setItemArrowNumCount(1); - fopAcM_createItemForSimpleDemo(&i_this->current.pos, ARROW_1, -1, NULL, NULL, 0.0f, + fopAcM_createItemForSimpleDemo(&i_this->current.pos, fpcNm_ITEM_ARROW_1, -1, NULL, NULL, 0.0f, 0.0f); mDoAud_seStart(Z2SE_CONSUMP_ITEM_GET, NULL, 0, 0); diff --git a/src/d/actor/d_a_e_ba.cpp b/src/d/actor/d_a_e_ba.cpp index 66ad44c836..ac6b0050fc 100644 --- a/src/d/actor/d_a_e_ba.cpp +++ b/src/d/actor/d_a_e_ba.cpp @@ -809,7 +809,7 @@ static void action(e_ba_class* i_this) { if (i_this->mKnockbackSpeed <= 1.0f || i_this->mAcch.ChkWallHit()) { fopAcM_delete(i_this); if (i_this->mHomeType == e_ba_class::HOME_APPEAR) { - // should be HEART : ARROW_10 but that gives incorrect code + // should be fpcNm_ITEM_HEART : fpcNm_ITEM_ARROW_10 but that gives incorrect code int item_no = dComIfGs_getLife() <= 4 ? 0 : 0xE; fopAcM_createItem(&i_this->current.pos, item_no, -1, -1, NULL, NULL, 0); fopAcM_createDisappear(i_this, &i_this->current.pos, 6, 0, 0xff); diff --git a/src/d/actor/d_a_e_fz.cpp b/src/d/actor/d_a_e_fz.cpp index f82f004d99..9df52ec5d1 100644 --- a/src/d/actor/d_a_e_fz.cpp +++ b/src/d/actor/d_a_e_fz.cpp @@ -66,7 +66,7 @@ daE_FZ_HIO_c::daE_FZ_HIO_c() { /* 806BE9D4-806BEAD8 000174 0104+00 1/1 0/0 0/0 .text draw__8daE_FZ_cFv */ s32 daE_FZ_c::draw() { - if (field_0x714 == 2 && !checkItemGet(IRONBALL,1)) { + if (field_0x714 == 2 && !checkItemGet(fpcNm_ITEM_IRONBALL,1)) { return 1; } @@ -827,7 +827,7 @@ void daE_FZ_c::cc_set() { /* 806C08C4-806C0B00 002064 023C+00 1/1 0/0 0/0 .text execute__8daE_FZ_cFv */ s32 daE_FZ_c::execute() { if (field_0x714 == 2) { - if (checkItemGet(IRONBALL,1) == 0) { + if (checkItemGet(fpcNm_ITEM_IRONBALL,1) == 0) { return 1; } @@ -1012,7 +1012,7 @@ s32 daE_FZ_c::create() { field_0x67c[i].set(current.pos); } - if (field_0x714 == 2 && !checkItemGet(IRONBALL,1)) { + if (field_0x714 == 2 && !checkItemGet(fpcNm_ITEM_IRONBALL,1)) { attention_info.distances[fopAc_attn_BATTLE_e] = 0; fopAcM_SetGroup(this,0); fopAcM_OffStatus(this,0); diff --git a/src/d/actor/d_a_kytag12.cpp b/src/d/actor/d_a_kytag12.cpp index ae2099e64f..d47c9321f1 100644 --- a/src/d/actor/d_a_kytag12.cpp +++ b/src/d/actor/d_a_kytag12.cpp @@ -49,7 +49,7 @@ static int daKytag12_Draw(kytag12_class* param_0) { static void daKytag12_light_swprd_proc(kytag12_class* i_this) { daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - if (dComIfGs_getSelectEquipSword() == LIGHT_SWORD) { + if (dComIfGs_getSelectEquipSword() == fpcNm_ITEM_LIGHT_SWORD) { if (player->getCutType() != 0) { if (i_this->field_0x576 == 0) { cXyz sp28(player->current.pos); @@ -878,7 +878,7 @@ static int daKytag12_Execute_R00(kytag12_class* i_this) { sp80.y = player->current.pos.y; if (player->current.pos.abs(sp80) < 600.0f && - dComIfGs_getSelectEquipSword() == LIGHT_SWORD && player->getCutType() != 0 && + dComIfGs_getSelectEquipSword() == fpcNm_ITEM_LIGHT_SWORD && player->getCutType() != 0 && d_kytag12_cut_turn_check()) { i_this->field_0x575 = 1; diff --git a/src/d/actor/d_a_npc_ne.cpp b/src/d/actor/d_a_npc_ne.cpp index 9992661a37..33081d5741 100644 --- a/src/d/actor/d_a_npc_ne.cpp +++ b/src/d/actor/d_a_npc_ne.cpp @@ -2993,7 +2993,7 @@ static int message(npc_ne_class* i_this) { i_this->mIsTalking = 0; if (i_this->mIsGengle == 1 && (i_this->mMsgFlow.getNowMsgNo() == 0x18a1 || i_this->mMsgFlow.getNowMsgNo() == 0x18a2)) { - fopAcM_createItem(&dComIfGp_getPlayer(0)->eyePos, SILVER_RUPEE, -1, + fopAcM_createItem(&dComIfGp_getPlayer(0)->eyePos, fpcNm_ITEM_SILVER_RUPEE, -1, fopAcM_GetRoomNo(i_this), NULL, NULL, 3); } } diff --git a/src/d/actor/d_a_npc_zra.inc b/src/d/actor/d_a_npc_zra.inc index 7a2f53087f..4f9b1c2044 100644 --- a/src/d/actor/d_a_npc_zra.inc +++ b/src/d/actor/d_a_npc_zra.inc @@ -2400,9 +2400,9 @@ void daNpc_zrA_c::moveRiverPosCalc(cXyz& o_pos) { void daNpc_zrA_c::createRuppi() { int item; if (cLib_getRndValue(0, 5) < 4) { - item = GREEN_RUPEE; + item = fpcNm_ITEM_GREEN_RUPEE; } else { - item = BLUE_RUPEE; + item = fpcNm_ITEM_BLUE_RUPEE; } cXyz pos(0.0f, 0.0f, -100.0f); mDoMtx_stack_c::transS(current.pos); diff --git a/src/d/actor/d_a_npc_zrc.cpp b/src/d/actor/d_a_npc_zrc.cpp index 9956e33e7e..e606c81aca 100644 --- a/src/d/actor/d_a_npc_zrc.cpp +++ b/src/d/actor/d_a_npc_zrc.cpp @@ -1179,7 +1179,7 @@ BOOL daNpc_zrC_c::doEvent() { (this->*mpActionFn)(NULL); } else if (dComIfGp_event_chkTalkXY()) { if (dComIfGp_evmng_ChkPresentEnd()) { - if (mType == 2 && dComIfGp_event_getPreItemNo() == ASHS_SCRIBBLING) { + if (mType == 2 && dComIfGp_event_getPreItemNo() == fpcNm_ITEM_ASHS_SCRIBBLING) { mFlowID = 0x35; mOrderEvtNo = EVT_EARRING_GET; changeEvent(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx], diff --git a/src/d/actor/d_a_obj_drop.cpp b/src/d/actor/d_a_obj_drop.cpp index 8f234e7070..acfcca3998 100644 --- a/src/d/actor/d_a_obj_drop.cpp +++ b/src/d/actor/d_a_obj_drop.cpp @@ -127,7 +127,7 @@ void daObjDrop_c::dropGet() { s8 area = dComIfGp_getStartStageDarkArea(); // "Drop of Light No%d<%d/%d> Get Area<%d>!\n" OS_REPORT("光の雫No%d<%d/%d>ゲットArea<%d>！\n", getSave(), num + 1, need_num, area); - execItemGet(HEART); + execItemGet(fpcNm_ITEM_HEART); mSetCollectDrop = false; } } diff --git a/src/d/actor/d_a_obj_ice_l.cpp b/src/d/actor/d_a_obj_ice_l.cpp index 97340326c3..cf737efa9d 100644 --- a/src/d/actor/d_a_obj_ice_l.cpp +++ b/src/d/actor/d_a_obj_ice_l.cpp @@ -441,7 +441,7 @@ int daObjIce_l_c::create() { } if (field_0x5b0 != 0) { - if (dComIfGs_getCollectSmell() == SMELL_FISH) { + if (dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_FISH) { field_0x5b1 = 1; } else { field_0x5b1 = 0xFF; diff --git a/src/d/actor/d_a_obj_ice_s.cpp b/src/d/actor/d_a_obj_ice_s.cpp index e37b61886e..9fa30a3332 100644 --- a/src/d/actor/d_a_obj_ice_s.cpp +++ b/src/d/actor/d_a_obj_ice_s.cpp @@ -503,7 +503,7 @@ int daObjIce_s_c::create() { field_0x5c4 = 1; } if (field_0x5c4 != 0) { - if (dComIfGs_getCollectSmell() == SMELL_FISH) { + if (dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_FISH) { field_0x5c5 = 1; } else { field_0x5c5 = 0xff; diff --git a/src/d/actor/d_a_obj_item.cpp b/src/d/actor/d_a_obj_item.cpp index 8030b1ef85..be4f48e396 100644 --- a/src/d/actor/d_a_obj_item.cpp +++ b/src/d/actor/d_a_obj_item.cpp @@ -68,13 +68,13 @@ void daItem_c::setBaseMtx() { mpModel->setBaseScale(scale); switch (m_itemNo) { - case GREEN_RUPEE: - case BLUE_RUPEE: - case YELLOW_RUPEE: - case RED_RUPEE: - case PURPLE_RUPEE: - case ORANGE_RUPEE: - case SILVER_RUPEE: + case fpcNm_ITEM_GREEN_RUPEE: + case fpcNm_ITEM_BLUE_RUPEE: + case fpcNm_ITEM_YELLOW_RUPEE: + case fpcNm_ITEM_RED_RUPEE: + case fpcNm_ITEM_PURPLE_RUPEE: + case fpcNm_ITEM_ORANGE_RUPEE: + case fpcNm_ITEM_SILVER_RUPEE: setBaseMtx_1(); break; default: @@ -223,9 +223,9 @@ void daItem_c::CreateInit() { initBaseMtx(); animPlay(1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f); - if (m_itemNo == BOOMERANG) { + if (m_itemNo == fpcNm_ITEM_BOOMERANG) { itemGetNextExecute(); - } else if ((m_itemNo == ORANGE_RUPEE || m_itemNo == SILVER_RUPEE) && + } else if ((m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) && mSparkleEmtr.getEmitter() == NULL) { dComIfGp_particle_set(0x0C14, &mSparklePos, NULL, NULL, -1, &mSparkleEmtr, -1, NULL, NULL, @@ -296,15 +296,15 @@ int daItem_c::_daItem_create() { return cPhs_ERROR_e; } - if (m_itemNo == SMALL_KEY || m_itemNo == KANTERA || m_itemNo == LIGHT_DROP || - m_itemNo == UTAWA_HEART || m_itemNo == KAKERA_HEART) + if (m_itemNo == fpcNm_ITEM_SMALL_KEY || m_itemNo == fpcNm_ITEM_KANTERA || m_itemNo == fpcNm_ITEM_LIGHT_DROP || + m_itemNo == fpcNm_ITEM_UTAWA_HEART || m_itemNo == fpcNm_ITEM_KAKERA_HEART) { - // "fpcNm_(ITEM) is an unhandled item<%d>\n" + // "fpcNm_ITEM_(ITEM) is an unhandled item<%d>\n" OS_REPORT_ERROR("fpcNm_(ITEM)では扱わないアイテムです<%d>\n", m_itemNo); JUT_ASSERT(0); return cPhs_ERROR_e; - } else if (m_itemNo == BOMB_5 || m_itemNo == BOMB_10 || m_itemNo == BOMB_20 || - m_itemNo == BOMB_30) + } else if (m_itemNo == fpcNm_ITEM_BOMB_5 || m_itemNo == fpcNm_ITEM_BOMB_10 || m_itemNo == fpcNm_ITEM_BOMB_20 || + m_itemNo == fpcNm_ITEM_BOMB_30) { // "Bomb Replenish Items are no longer in use!\n" OS_REPORT_ERROR("補給アイテムの爆弾は使用不可になりました！\n"); @@ -391,7 +391,7 @@ int daItem_c::_daItem_execute() { mLastPos = current.pos; field_0x95f = (fopAcM_checkHookCarryNow(this) >> 0x14) & 1; - if (m_itemNo == ORANGE_RUPEE || m_itemNo == SILVER_RUPEE) { + if (m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) { mSparklePos = current.pos; mSparklePos.y += 18.0f; } @@ -416,7 +416,7 @@ int daItem_c::_daItem_draw() { int daItem_c::_daItem_delete() { mSound.deleteObject(); - if (m_itemNo == ORANGE_RUPEE || m_itemNo == SILVER_RUPEE) { + if (m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) { mSparkleEmtr.remove(); } @@ -523,7 +523,7 @@ void daItem_c::procMainSimpleGetDemo() { void daItem_c::procInitGetDemoEvent() { hide(); - if (m_itemNo == ORANGE_RUPEE || m_itemNo == SILVER_RUPEE) { + if (m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) { mSparkleEmtr.remove(); } @@ -547,7 +547,7 @@ void daItem_c::procWaitGetDemoEvent() { dComIfGp_event_setItemPartnerId(m_item_id); } } else { - if (m_itemNo == BOOMERANG) { + if (m_itemNo == fpcNm_ITEM_BOOMERANG) { fopAcM_orderItemEvent(this, 0, 0); eventInfo.i_onCondition(dEvtCnd_CANGETITEM_e); return; @@ -784,27 +784,27 @@ void daItem_c::mode_wait() { } switch (m_itemNo) { - case HEART: + case fpcNm_ITEM_HEART: itemActionForHeart(); break; - case ARROW_10: - case ARROW_20: - case ARROW_30: - case ARROW_1: - case PACHINKO_SHOT: - case LIGHT_ARROW: + case fpcNm_ITEM_ARROW_10: + case fpcNm_ITEM_ARROW_20: + case fpcNm_ITEM_ARROW_30: + case fpcNm_ITEM_ARROW_1: + case fpcNm_ITEM_PACHINKO_SHOT: + case fpcNm_ITEM_LIGHT_ARROW: itemActionForArrow(); break; - case BOOMERANG: + case fpcNm_ITEM_BOOMERANG: itemActionForBoomerang(); break; - case GREEN_RUPEE: - case BLUE_RUPEE: - case YELLOW_RUPEE: - case RED_RUPEE: - case PURPLE_RUPEE: - case ORANGE_RUPEE: - case SILVER_RUPEE: + case fpcNm_ITEM_GREEN_RUPEE: + case fpcNm_ITEM_BLUE_RUPEE: + case fpcNm_ITEM_YELLOW_RUPEE: + case fpcNm_ITEM_RED_RUPEE: + case fpcNm_ITEM_PURPLE_RUPEE: + case fpcNm_ITEM_ORANGE_RUPEE: + case fpcNm_ITEM_SILVER_RUPEE: default: itemActionForRupee(); break; @@ -829,24 +829,24 @@ void daItem_c::mode_water() { f32 scale = 1.0f; switch (m_itemNo) { - case HEART: + case fpcNm_ITEM_HEART: scale = 0.5f; break; - case GREEN_RUPEE: - case BLUE_RUPEE: - case YELLOW_RUPEE: - case RED_RUPEE: - case PURPLE_RUPEE: - case ORANGE_RUPEE: + case fpcNm_ITEM_GREEN_RUPEE: + case fpcNm_ITEM_BLUE_RUPEE: + case fpcNm_ITEM_YELLOW_RUPEE: + case fpcNm_ITEM_RED_RUPEE: + case fpcNm_ITEM_PURPLE_RUPEE: + case fpcNm_ITEM_ORANGE_RUPEE: scale = 1.0f; break; - case ARROW_10: - case ARROW_20: - case ARROW_30: - case ARROW_1: + case fpcNm_ITEM_ARROW_10: + case fpcNm_ITEM_ARROW_20: + case fpcNm_ITEM_ARROW_30: + case fpcNm_ITEM_ARROW_1: scale = 1.0f; break; - case PACHINKO_SHOT: + case fpcNm_ITEM_PACHINKO_SHOT: scale = 1.0f; break; } @@ -868,22 +868,22 @@ void daItem_c::itemGetNextExecute() { BOOL haveItem = false; switch (m_itemNo) { - case HEART: - case GREEN_RUPEE: - case ARROW_10: - case ARROW_20: - case ARROW_30: - case ARROW_1: + case fpcNm_ITEM_HEART: + case fpcNm_ITEM_GREEN_RUPEE: + case fpcNm_ITEM_ARROW_10: + case fpcNm_ITEM_ARROW_20: + case fpcNm_ITEM_ARROW_30: + case fpcNm_ITEM_ARROW_1: procInitSimpleGetDemo(); itemGet(); break; - case BLUE_RUPEE: - case YELLOW_RUPEE: - case RED_RUPEE: - case PURPLE_RUPEE: - case ORANGE_RUPEE: - case SILVER_RUPEE: - case PACHINKO_SHOT: + case fpcNm_ITEM_BLUE_RUPEE: + case fpcNm_ITEM_YELLOW_RUPEE: + case fpcNm_ITEM_RED_RUPEE: + case fpcNm_ITEM_PURPLE_RUPEE: + case fpcNm_ITEM_ORANGE_RUPEE: + case fpcNm_ITEM_SILVER_RUPEE: + case fpcNm_ITEM_PACHINKO_SHOT: if (daPy_getPlayerActorClass()->checkCanoeRide() || daPy_getPlayerActorClass()->checkHorseRide()) { @@ -903,7 +903,7 @@ void daItem_c::itemGetNextExecute() { itemGet(); } break; - case BOOMERANG: + case fpcNm_ITEM_BOOMERANG: procInitGetDemoEvent(); break; default: @@ -922,45 +922,45 @@ void daItem_c::itemGetNextExecute() { /* 8015D0A8-8015D370 1579E8 02C8+00 2/2 0/0 0/0 .text itemGet__8daItem_cFv */ void daItem_c::itemGet() { switch (m_itemNo) { - case HEART: + case fpcNm_ITEM_HEART: mDoAud_seStart(Z2SE_HEART_PIECE_GET, NULL, 0, 0); execItemGet(m_itemNo); break; - case GREEN_RUPEE: + case fpcNm_ITEM_GREEN_RUPEE: mDoAud_seStart(Z2SE_GREEN_LUPY_GET, NULL, 0, 0); execItemGet(m_itemNo); break; - case BLUE_RUPEE: + case fpcNm_ITEM_BLUE_RUPEE: mDoAud_seStart(Z2SE_BLUE_LUPY_GET, NULL, 0, 0); execItemGet(m_itemNo); break; - case YELLOW_RUPEE: + case fpcNm_ITEM_YELLOW_RUPEE: mDoAud_seStart(Z2SE_BLUE_LUPY_GET, NULL, 0, 0); execItemGet(m_itemNo); break; - case RED_RUPEE: + case fpcNm_ITEM_RED_RUPEE: mDoAud_seStart(Z2SE_RED_LUPY_GET, NULL, 0, 0); execItemGet(m_itemNo); break; - case PURPLE_RUPEE: + case fpcNm_ITEM_PURPLE_RUPEE: mDoAud_seStart(Z2SE_RED_LUPY_GET, NULL, 0, 0); execItemGet(m_itemNo); break; - case ORANGE_RUPEE: + case fpcNm_ITEM_ORANGE_RUPEE: mDoAud_seStart(Z2SE_RED_LUPY_GET, NULL, 0, 0); execItemGet(m_itemNo); break; - case SILVER_RUPEE: + case fpcNm_ITEM_SILVER_RUPEE: mDoAud_seStart(Z2SE_RED_LUPY_GET, NULL, 0, 0); execItemGet(m_itemNo); break; - case BOOMERANG: + case fpcNm_ITEM_BOOMERANG: break; - case ARROW_10: - case ARROW_20: - case ARROW_30: - case ARROW_1: - case PACHINKO_SHOT: + case fpcNm_ITEM_ARROW_10: + case fpcNm_ITEM_ARROW_20: + case fpcNm_ITEM_ARROW_30: + case fpcNm_ITEM_ARROW_1: + case fpcNm_ITEM_PACHINKO_SHOT: mDoAud_seStart(Z2SE_CONSUMP_ITEM_GET, NULL, 0, 0); execItemGet(m_itemNo); default: @@ -1123,19 +1123,19 @@ void daItem_c::set_bound_se() { } switch (m_itemNo) { - case GREEN_RUPEE: - case BLUE_RUPEE: - case YELLOW_RUPEE: - case RED_RUPEE: - case PURPLE_RUPEE: - case ORANGE_RUPEE: + case fpcNm_ITEM_GREEN_RUPEE: + case fpcNm_ITEM_BLUE_RUPEE: + case fpcNm_ITEM_YELLOW_RUPEE: + case fpcNm_ITEM_RED_RUPEE: + case fpcNm_ITEM_PURPLE_RUPEE: + case fpcNm_ITEM_ORANGE_RUPEE: fopAcM_seStart(this, Z2SE_OBJ_LUPY_BOUND, var_r31); break; - case ARROW_10: - case ARROW_20: - case ARROW_30: - case ARROW_1: - case LIGHT_ARROW: + case fpcNm_ITEM_ARROW_10: + case fpcNm_ITEM_ARROW_20: + case fpcNm_ITEM_ARROW_30: + case fpcNm_ITEM_ARROW_1: + case fpcNm_ITEM_LIGHT_ARROW: fopAcM_seStart(this, Z2SE_OBJ_ARROW_BOUND, var_r31); break; } @@ -1284,7 +1284,7 @@ void daItem_c::initSpeed(BOOL i_noTypeChk) { u8 type = daItem_prm::getType(this); if (!i_noTypeChk) { - if (type == TYPE_WAIT_e || type == TYPE_BOOM_HIT_e || m_itemNo == BOOMERANG) { + if (type == TYPE_WAIT_e || type == TYPE_BOOM_HIT_e || m_itemNo == fpcNm_ITEM_BOOMERANG) { y_speed = 0.0f; speedf = 0.0f; } else if (type == TYPE_LAUNCH_NO_RND_e || type == TYPE_FIXED_PLACE_e) { diff --git a/src/d/actor/d_a_obj_kiPot.cpp b/src/d/actor/d_a_obj_kiPot.cpp index 0a41cd9351..c86d3b7673 100644 --- a/src/d/actor/d_a_obj_kiPot.cpp +++ b/src/d/actor/d_a_obj_kiPot.cpp @@ -72,7 +72,7 @@ void daKiPot_c::init_modeWait() { /* 80C44F80-80C45008 000360 0088+00 1/0 0/0 0/0 .text modeWait__9daKiPot_cFv */ void daKiPot_c::modeWait() { if (chkEvent() && eventInfo.i_checkCommandCatch() == 0) { - dComIfGp_att_CatchRequest(this, UGLY_SOUP, 100.0f, 50.0f, -50.0f, 0x2000, 1); + dComIfGp_att_CatchRequest(this, fpcNm_ITEM_UGLY_SOUP, 100.0f, 50.0f, -50.0f, 0x2000, 1); eventInfo.i_onCondition(0x40); } } diff --git a/src/d/actor/d_a_obj_lv4digsand.cpp b/src/d/actor/d_a_obj_lv4digsand.cpp index 8efde07eb7..653f1c7ff6 100644 --- a/src/d/actor/d_a_obj_lv4digsand.cpp +++ b/src/d/actor/d_a_obj_lv4digsand.cpp @@ -88,7 +88,7 @@ int daObjL4DigSand_c::create1st() { /* 80C66D40-80C66DD0 0002A0 0090+00 1/0 0/0 0/0 .text Execute__16daObjL4DigSand_cFPPA3_A4_f */ int daObjL4DigSand_c::Execute(f32 (**param_0)[3][4]) { - if (daPy_py_c::i_checkNowWolf() && checkItemGet(SMELL_POH, 1)) { + if (daPy_py_c::i_checkNowWolf() && checkItemGet(fpcNm_ITEM_SMELL_POH, 1)) { attention_info.flags = 0x80; } else { attention_info.flags = 0; diff --git a/src/d/actor/d_a_obj_master_sword.cpp b/src/d/actor/d_a_obj_master_sword.cpp index 81b859b6c1..421d1aab35 100644 --- a/src/d/actor/d_a_obj_master_sword.cpp +++ b/src/d/actor/d_a_obj_master_sword.cpp @@ -143,7 +143,7 @@ void daObjMasterSword_c::executeWait() { } if (fopAcM_checkCarryNow(this)) { - dMeter2Info_setCloth(WEAR_KOKIRI, false); + dMeter2Info_setCloth(fpcNm_ITEM_WEAR_KOKIRI, false); fopAcM_orderMapToolEvent(this, getEventID(), 0xFF, 0xFFFF, 1, 0); } } @@ -548,9 +548,9 @@ int daObjMasterSword_c::execute() { mBrk.play(); if (dComIfGs_isTmpBit(dSv_event_tmp_flag_c::tempBitLabels[73])) { - dComIfGs_onItemFirstBit(MASTER_SWORD); - dMeter2Info_setSword(MASTER_SWORD, false); - dComIfGs_setSelectEquipSword(MASTER_SWORD); + dComIfGs_onItemFirstBit(fpcNm_ITEM_MASTER_SWORD); + dMeter2Info_setSword(fpcNm_ITEM_MASTER_SWORD, false); + dComIfGs_setSelectEquipSword(fpcNm_ITEM_MASTER_SWORD); dComIfGp_setItemLifeCount(dComIfGs_getMaxLife(), 0); dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[getFlagNo()]); diff --git a/src/d/actor/d_a_obj_oiltubo.cpp b/src/d/actor/d_a_obj_oiltubo.cpp index 991f33e1a8..b4b5004aa7 100644 --- a/src/d/actor/d_a_obj_oiltubo.cpp +++ b/src/d/actor/d_a_obj_oiltubo.cpp @@ -289,7 +289,7 @@ int daObj_Oiltubo_c::wait(void* unused) { switch (mMode) { case 1: if (!eventInfo.i_checkCommandCatch()) { - dComIfGp_att_CatchRequest(this, OIL_BOTTLE_2, 100.0f, 50.0f, -50.0f, 0x2000, 1); + dComIfGp_att_CatchRequest(this, fpcNm_ITEM_OIL_BOTTLE_2, 100.0f, 50.0f, -50.0f, 0x2000, 1); eventInfo.i_onCondition(0x40); } break; diff --git a/src/d/actor/d_a_obj_swBallC.cpp b/src/d/actor/d_a_obj_swBallC.cpp index a086736671..7b8824c505 100644 --- a/src/d/actor/d_a_obj_swBallC.cpp +++ b/src/d/actor/d_a_obj_swBallC.cpp @@ -274,7 +274,7 @@ int daObjSwBallC_c::demoProc() { break; case 10: field_0x584 = 1; - execItemGet(LIGHT_SWORD); + execItemGet(fpcNm_ITEM_LIGHT_SWORD); break; } } diff --git a/src/d/actor/d_a_player.cpp b/src/d/actor/d_a_player.cpp index 803f127e63..59fc521ba4 100644 --- a/src/d/actor/d_a_player.cpp +++ b/src/d/actor/d_a_player.cpp @@ -145,63 +145,63 @@ u32 daPy_py_c::setParamData(int param_0, int param_1, int param_2, int param_3) /* 8015EA20-8015EA48 159360 0028+00 0/0 10/10 3/3 .text checkFishingRodItem__9daPy_py_cFi */ BOOL daPy_py_c::checkFishingRodItem(int i_itemNo) { - return i_itemNo == FISHING_ROD_1 || (i_itemNo >= BEE_ROD && i_itemNo <= JEWEL_WORM_ROD); + return i_itemNo == fpcNm_ITEM_FISHING_ROD_1 || (i_itemNo >= fpcNm_ITEM_BEE_ROD && i_itemNo <= fpcNm_ITEM_JEWEL_WORM_ROD); } /* 8015EA48-8015EA88 159388 0040+00 0/0 3/3 0/0 .text checkBombItem__9daPy_py_cFi */ BOOL daPy_py_c::checkBombItem(int i_itemNo) { - return i_itemNo == NORMAL_BOMB || i_itemNo == WATER_BOMB || i_itemNo == POKE_BOMB; + return i_itemNo == fpcNm_ITEM_NORMAL_BOMB || i_itemNo == fpcNm_ITEM_WATER_BOMB || i_itemNo == fpcNm_ITEM_POKE_BOMB; } /* 8015EA88-8015EAD8 1593C8 0050+00 0/0 5/5 0/0 .text checkBottleItem__9daPy_py_cFi */ BOOL daPy_py_c::checkBottleItem(int i_itemNo) { - return (i_itemNo >= EMPTY_BOTTLE && i_itemNo <= FAIRY) || i_itemNo == BEE_CHILD || - i_itemNo == WORM || i_itemNo == FAIRY_DROP || i_itemNo == CHUCHU_BLACK || - (i_itemNo >= CHUCHU_RARE && i_itemNo <= LV3_SOUP); + return (i_itemNo >= fpcNm_ITEM_EMPTY_BOTTLE && i_itemNo <= fpcNm_ITEM_FAIRY) || i_itemNo == fpcNm_ITEM_BEE_CHILD || + i_itemNo == fpcNm_ITEM_WORM || i_itemNo == fpcNm_ITEM_FAIRY_DROP || i_itemNo == fpcNm_ITEM_CHUCHU_BLACK || + (i_itemNo >= fpcNm_ITEM_CHUCHU_RARE && i_itemNo <= fpcNm_ITEM_LV3_SOUP); } /* 8015EAD8-8015EB40 159418 0068+00 0/0 3/3 0/0 .text checkDrinkBottleItem__9daPy_py_cFi */ BOOL daPy_py_c::checkDrinkBottleItem(int i_itemNo) { - return (i_itemNo >= RED_BOTTLE && i_itemNo <= HALF_MILK_BOTTLE) || i_itemNo == RED_BOTTLE_2 || - i_itemNo == UGLY_SOUP || i_itemNo == HOT_SPRING || i_itemNo == BEE_CHILD || - i_itemNo == CHUCHU_BLACK || i_itemNo == FAIRY_DROP || - (i_itemNo >= CHUCHU_RARE && i_itemNo != CHUCHU_YELLOW && i_itemNo <= LV3_SOUP); + return (i_itemNo >= fpcNm_ITEM_RED_BOTTLE && i_itemNo <= fpcNm_ITEM_HALF_MILK_BOTTLE) || i_itemNo == fpcNm_ITEM_RED_BOTTLE_2 || + i_itemNo == fpcNm_ITEM_UGLY_SOUP || i_itemNo == fpcNm_ITEM_HOT_SPRING || i_itemNo == fpcNm_ITEM_BEE_CHILD || + i_itemNo == fpcNm_ITEM_CHUCHU_BLACK || i_itemNo == fpcNm_ITEM_FAIRY_DROP || + (i_itemNo >= fpcNm_ITEM_CHUCHU_RARE && i_itemNo != fpcNm_ITEM_CHUCHU_YELLOW && i_itemNo <= fpcNm_ITEM_LV3_SOUP); } /* 8015EB40-8015EB68 159480 0028+00 0/0 4/4 0/0 .text checkOilBottleItem__9daPy_py_cFi */ BOOL daPy_py_c::checkOilBottleItem(int i_itemNo) { - return i_itemNo == CHUCHU_YELLOW || i_itemNo == OIL_BOTTLE_2 || i_itemNo == OIL_BOTTLE; + return i_itemNo == fpcNm_ITEM_CHUCHU_YELLOW || i_itemNo == fpcNm_ITEM_OIL_BOTTLE_2 || i_itemNo == fpcNm_ITEM_OIL_BOTTLE; } /* 8015EB68-8015EB90 1594A8 0028+00 0/0 2/2 0/0 .text checkOpenBottleItem__9daPy_py_cFi */ BOOL daPy_py_c::checkOpenBottleItem(int i_itemNo) { - return i_itemNo == WATER_BOTTLE || i_itemNo == WORM || i_itemNo == FAIRY; + return i_itemNo == fpcNm_ITEM_WATER_BOTTLE || i_itemNo == fpcNm_ITEM_WORM || i_itemNo == fpcNm_ITEM_FAIRY; } /* 8015EB90-8015EBB8 1594D0 0028+00 0/0 11/11 0/0 .text checkBowItem__9daPy_py_cFi */ BOOL daPy_py_c::checkBowItem(int i_itemNo) { - return i_itemNo == BOW || i_itemNo == BOMB_ARROW || i_itemNo == HAWK_ARROW; + return i_itemNo == fpcNm_ITEM_BOW || i_itemNo == fpcNm_ITEM_BOMB_ARROW || i_itemNo == fpcNm_ITEM_HAWK_ARROW; } /* 8015EBB8-8015EBD8 1594F8 0020+00 0/0 23/23 0/0 .text checkHookshotItem__9daPy_py_cFi */ BOOL daPy_py_c::checkHookshotItem(int i_itemNo) { - return i_itemNo == HOOKSHOT || i_itemNo == W_HOOKSHOT; + return i_itemNo == fpcNm_ITEM_HOOKSHOT || i_itemNo == fpcNm_ITEM_W_HOOKSHOT; } /* 8015EBD8-8015EC28 159518 0050+00 0/0 3/3 0/0 .text checkTradeItem__9daPy_py_cFi */ BOOL daPy_py_c::checkTradeItem(int i_itemNo) { - return (i_itemNo >= LETTER && i_itemNo <= IRIAS_PENDANT) || i_itemNo == ANCIENT_DOCUMENT || - i_itemNo == AIR_LETTER || i_itemNo == ANCIENT_DOCUMENT2 || i_itemNo == RAFRELS_MEMO || - i_itemNo == TKS_LETTER || i_itemNo == ASHS_SCRIBBLING; + return (i_itemNo >= fpcNm_ITEM_LETTER && i_itemNo <= fpcNm_ITEM_IRIAS_PENDANT) || i_itemNo == fpcNm_ITEM_ANCIENT_DOCUMENT || + i_itemNo == fpcNm_ITEM_AIR_LETTER || i_itemNo == fpcNm_ITEM_ANCIENT_DOCUMENT2 || i_itemNo == fpcNm_ITEM_RAFRELS_MEMO || + i_itemNo == fpcNm_ITEM_TKS_LETTER || i_itemNo == fpcNm_ITEM_ASHS_SCRIBBLING; } /* 8015EC28-8015EC48 159568 0020+00 0/0 2/2 0/0 .text checkDungeonWarpItem__9daPy_py_cFi */ BOOL daPy_py_c::checkDungeonWarpItem(int i_itemNo) { - return i_itemNo == DUNGEON_EXIT || i_itemNo == DUNGEON_BACK; + return i_itemNo == fpcNm_ITEM_DUNGEON_EXIT || i_itemNo == fpcNm_ITEM_DUNGEON_BACK; } /* 8015EC48-8015ECB8 159588 0070+00 0/0 10/10 3/3 .text setActor__16daPy_actorKeep_cFv */ @@ -445,7 +445,7 @@ BOOL daPy_py_c::checkMasterSwordEquip() { u32 equipSword = dComIfGs_getSelectEquipSword(); bool isMasterSword = false; - if (equipSword == MASTER_SWORD || equipSword == LIGHT_SWORD) { + if (equipSword == fpcNm_ITEM_MASTER_SWORD || equipSword == fpcNm_ITEM_LIGHT_SWORD) { isMasterSword = true; } @@ -457,7 +457,7 @@ BOOL daPy_py_c::checkMasterSwordEquip() { BOOL daPy_py_c::checkWoodShieldEquip() { u16 equipShield = dComIfGs_getSelectEquipShield(); - return equipShield == WOOD_SHIELD || equipShield == SHIELD; + return equipShield == fpcNm_ITEM_WOOD_SHIELD || equipShield == fpcNm_ITEM_SHIELD; } BOOL daPy_py_c::checkNowWolf() { @@ -651,4 +651,4 @@ int daPy_addCalcShort(s16* i_value, s16 i_target, s16 i_scale, s16 i_maxStep, s1 } } return i_target - *i_value; -} \ No newline at end of file +} diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index dfeba958c4..70c2db1f25 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -10,75 +10,75 @@ /* 8059E9B8-8059EC04 000078 024C+00 2/2 0/0 0/0 .text getShopArcname__12daShopItem_cFv */ const char* daShopItem_c::getShopArcname() { switch (m_itemNo) { - case NO_ITEM: + case fpcNm_ITEM_NONE: if (strcmp("R_SP160", dComIfGp_getStartStageName()) == 0) { mShopItemID = SHOP_ITEMNO_ARMOR_SOLD; } else { mShopItemID = SHOP_ITEMNO_SOLD; } break; - case OIL_BOTTLE: + case fpcNm_ITEM_OIL_BOTTLE: mShopItemID = SHOP_ITEMNO_OIL; break; - case MILK_BOTTLE: + case fpcNm_ITEM_MILK_BOTTLE: mShopItemID = SHOP_ITEMNO_MILK; break; - case HALF_MILK_BOTTLE: + case fpcNm_ITEM_HALF_MILK_BOTTLE: mShopItemID = SHOP_ITEMNO_HALF_MILK; break; - case RED_BOTTLE: + case fpcNm_ITEM_RED_BOTTLE: mShopItemID = SHOP_ITEMNO_RED; break; - case GREEN_BOTTLE: + case fpcNm_ITEM_GREEN_BOTTLE: mShopItemID = SHOP_ITEMNO_GREEN; break; - case BLUE_BOTTLE: + case fpcNm_ITEM_BLUE_BOTTLE: mShopItemID = SHOP_ITEMNO_BLUE; break; - case DROP_BOTTLE: + case fpcNm_ITEM_DROP_BOTTLE: mShopItemID = SHOP_ITEMNO_DROP; break; - case ARROW_10: - case ARROW_20: - case ARROW_30: + case fpcNm_ITEM_ARROW_10: + case fpcNm_ITEM_ARROW_20: + case fpcNm_ITEM_ARROW_30: mShopItemID = SHOP_ITEMNO_ARROW; break; - case SHIELD: + case fpcNm_ITEM_SHIELD: mShopItemID = SHOP_ITEMNO_SHIELD_B; break; - case HYLIA_SHIELD: + case fpcNm_ITEM_HYLIA_SHIELD: mShopItemID = SHOP_ITEMNO_SHIELD_A; break; - case NORMAL_BOMB: - case BOMB_5: - case BOMB_10: - case BOMB_20: - case BOMB_30: + case fpcNm_ITEM_NORMAL_BOMB: + case fpcNm_ITEM_BOMB_5: + case fpcNm_ITEM_BOMB_10: + case fpcNm_ITEM_BOMB_20: + case fpcNm_ITEM_BOMB_30: mShopItemID = SHOP_ITEMNO_BOMB; break; - case WATER_BOMB: + case fpcNm_ITEM_WATER_BOMB: mShopItemID = SHOP_ITEMNO_WATER_BOMB; break; - case POKE_BOMB: + case fpcNm_ITEM_POKE_BOMB: mShopItemID = SHOP_ITEMNO_POKE_BOMB; break; - case BOMB_BAG_LV1: - case BOMB_IN_BAG: + case fpcNm_ITEM_BOMB_BAG_LV1: + case fpcNm_ITEM_BOMB_IN_BAG: mShopItemID = SHOP_ITEMNO_BOMB_BAG; break; - case BOMB_BAG_LV2: + case fpcNm_ITEM_BOMB_BAG_LV2: mShopItemID = SHOP_ITEMNO_BOMB_BAG_LV2; break; - case BEE_CHILD: + case fpcNm_ITEM_BEE_CHILD: mShopItemID = SHOP_ITEMNO_BEE_CHILD; break; - case PACHINKO: + case fpcNm_ITEM_PACHINKO: mShopItemID = SHOP_ITEMNO_PACHINKO; break; - case HAWK_EYE: + case fpcNm_ITEM_HAWK_EYE: mShopItemID = SHOP_ITEMNO_HAWKEYE; break; - case ARMOR: + case fpcNm_ITEM_ARMOR: mShopItemID = SHOP_ITEMNO_ARMOR; break; default: @@ -185,7 +185,7 @@ void daShopItem_c::setListStart() {} /* 8059EFA0-8059F024 000660 0084+00 1/0 0/0 0/0 .text setShadow__12daShopItem_cFv */ void daShopItem_c::setShadow() { - if (m_itemNo != NO_ITEM) { + if (m_itemNo != fpcNm_ITEM_NONE) { daItemBase_c::setShadow(); } else { mShadowKey = dComIfGd_setShadow(mShadowKey, 1, mpModel, ¤t.pos, 80.0f, 0.0f, @@ -234,7 +234,7 @@ int daShopItem_c::_create() { if (getShopArcname() == NULL) { // "Display model archive name doesn't exist![%d]\n" OS_REPORT("陳列用モデルのアーカイブ名がありません！[%d]\n", m_itemNo); - m_itemNo = NO_ITEM; + m_itemNo = fpcNm_ITEM_NONE; } int phase_state = dComIfG_resLoad(&mPhase, getShopArcname()); diff --git a/src/d/actor/d_a_tag_bottle_item.cpp b/src/d/actor/d_a_tag_bottle_item.cpp index 8b4ae84d5f..6d94cc4edd 100644 --- a/src/d/actor/d_a_tag_bottle_item.cpp +++ b/src/d/actor/d_a_tag_bottle_item.cpp @@ -130,15 +130,15 @@ s32 daTag_BottleItem_c::chkEvent() { s32 daTag_BottleItem_c::orderEvent() { makeSoup(); - if (!daPy_py_c::i_checkNowWolf() && mBottleItemType != EMPTY_BOTTLE) { + if (!daPy_py_c::i_checkNowWolf() && mBottleItemType != fpcNm_ITEM_EMPTY_BOTTLE) { attention_info.flags = 0x20000008; } else { attention_info.flags = 0; } if (attention_info.flags == 0x20000008) { - attention_info.distances[fopAc_attn_TALK_e] = EMPTY_BOTTLE; - attention_info.distances[fopAc_attn_SPEAK_e] = EMPTY_BOTTLE; + attention_info.distances[fopAc_attn_TALK_e] = fpcNm_ITEM_EMPTY_BOTTLE; + attention_info.distances[fopAc_attn_SPEAK_e] = fpcNm_ITEM_EMPTY_BOTTLE; eventInfo.i_onCondition(dEvtCnd_CANTALK_e); } @@ -147,12 +147,12 @@ s32 daTag_BottleItem_c::orderEvent() { /* 80D56418-80D564A0 0004B8 0088+00 2/2 0/0 0/0 .text makeSoup__18daTag_BottleItem_cFv */ void daTag_BottleItem_c::makeSoup() { - if (mBottleItemType == LV1_SOUP && dComIfGs_isEventBit(2)) { - mBottleItemType = LV2_SOUP; + if (mBottleItemType == fpcNm_ITEM_LV1_SOUP && dComIfGs_isEventBit(2)) { + mBottleItemType = fpcNm_ITEM_LV2_SOUP; } - if (mBottleItemType == LV2_SOUP && dComIfGs_isEventBit(1)) { - mBottleItemType = LV3_SOUP; + if (mBottleItemType == fpcNm_ITEM_LV2_SOUP && dComIfGs_isEventBit(1)) { + mBottleItemType = fpcNm_ITEM_LV3_SOUP; } } diff --git a/src/d/actor/d_a_tag_statue_evt.cpp b/src/d/actor/d_a_tag_statue_evt.cpp index 17bdca9fc8..6cc647c539 100644 --- a/src/d/actor/d_a_tag_statue_evt.cpp +++ b/src/d/actor/d_a_tag_statue_evt.cpp @@ -328,13 +328,13 @@ int daTagStatue_c::demoProc() { case DEMO_ACTION_AWARD_ITEM: // If the player already has 5 Sky Characters, reward them with the completed Ancient Sky Book, // otherwise, reward another character - enum ItemTable item; + int item; if(getLetterCount() == 5) { - item = ANCIENT_DOCUMENT2; + item = fpcNm_ITEM_ANCIENT_DOCUMENT2; dComIfGs_onEventBit(dSv_event_flag_c::F_0796); } else { - item = AIR_LETTER; + item = fpcNm_ITEM_AIR_LETTER; } mTreasureDemoItemId = fopAcM_createItemForTrBoxDemo(&fopAcM_GetPosition(this), item, -1, fopAcM_GetRoomNo(this), 0, 0); diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 96061299d7..8cd0ef5176 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -6,39 +6,42 @@ #include "d/actor/d_a_tbox.h" #include "d/d_tresure.h" #include "d/d_item_data.h" -#include "f_op/f_op_actor.h" -#include "f_pc/f_pc_base.h" #include "d/actor/d_a_midna.h" -#include "d/d_procname.h" #include "d/d_path.h" #include "d/d_bg_w.h" #include "SSystem/SComponent/c_math.h" +#include "Z2AudioLib/Z2Instances.h" +#include + +UNK_REL_DATA + +UNK_BSS(1109) +UNK_BSS(1107) +UNK_BSS(1105) +UNK_BSS(1104) +UNK_BSS(1099) +UNK_BSS(1097) +UNK_BSS(1095) +UNK_BSS(1094) +UNK_BSS(1057) +UNK_BSS(1055) +UNK_BSS(1053) +UNK_BSS(1052) +UNK_BSS(1014) +UNK_BSS(1012) +UNK_BSS(1010) +UNK_BSS(1009) /* 804961D4-804961EC 000000 0018+00 16/16 0/0 0/0 .rodata l_cull_size_box */ -static f32 const l_cull_size_box[6] = { -150.0f, -10.0f, -150.0f, 150.0f, 300.0f, 100.0f }; +static const f32 l_cull_size_box[6] = { -150.0f, -10.0f, -150.0f, 150.0f, 300.0f, 100.0f }; /* 804961EC-80496228 000018 003C+00 1/2 0/0 0/0 .rodata l_cyl_info */ -static cM3dGCylS const l_cyl_info[3] = { +static const cM3dGCylS l_cyl_info[3] = { { 0.0f, 0.0f, -40.0f, 40.0f, 60.0f }, { 0.0f, 0.0f, -60.0f, 50.0f, 70.0f }, { 0.0f, 0.0f, -60.0f, 70.0f, 80.0f }, }; -/* 80496494-804964A0 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 804964A0-804964B4 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; - /* 804964B4-804964B8 -00001 0004+00 2/4 0/0 0/0 .data l_staff_name */ static char* l_staff_name = "TREASURE"; @@ -94,65 +97,75 @@ daTbox_ModelInfo* daTbox_c::getModelInfo() { return &l_modelInfo[getShapeType()]; } -/* ############################################################################################## */ /* 80496238-80496244 000064 000C+00 0/1 0/0 0/0 .rodata l_open_se_id */ -static u32 const l_open_se_id[3] = { 0x8001f, 0x80020, 0x80022 }; +static const u32 l_open_se_id[3] = { Z2SE_OBJ_TBOX_OPEN_A, Z2SE_OBJ_TBOX_OPEN_B, Z2SE_OBJ_TBOX_OPEN_C }; /* 80490E6C-80491170 00022C 0304+00 1/1 0/0 0/0 .text commonShapeSet__8daTbox_cFv */ cPhs__Step daTbox_c::commonShapeSet() { daTbox_ModelInfo* model_info = getModelInfo(); - J3DModelData* model_data = - (J3DModelData*)dComIfG_getObjectRes(model_info->mArcName, model_info->mModelResNo); + + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(model_info->mArcName, model_info->mModelResNo); + JUT_ASSERT(0x191, modelData != 0); + mpAnm = new mDoExt_bckAnm(); if (mpAnm == NULL) { return cPhs_ERROR_e; } - J3DAnmTransform* bck_anm_transform = - (J3DAnmTransform*)dComIfG_getObjectRes(model_info->mArcName, model_info->mBckResNo); - if (!mpAnm->init(bck_anm_transform, 1, 0, 1.0f, 0, -1, false)) { + + J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(model_info->mArcName, model_info->mBckResNo); + if (!mpAnm->init(bck, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false)) { return cPhs_ERROR_e; } + mOpenSeId = l_open_se_id[getShapeType()]; u32 model_flag = 0x80000; if (getShapeType() == SHAPE_BOSSKEY) { model_flag = 0; } - mpModel = mDoExt_J3DModel__create(model_data, model_flag, 0x11000084); + + mpModel = mDoExt_J3DModel__create(modelData, model_flag, 0x11000084); if (mpModel == NULL) { return cPhs_ERROR_e; } + if (!strcmp(dComIfGp_getStartStageName(), "D_MN01B")) { // Deku Toad chest - J3DModelData* model_data2 = - (J3DModelData*)dComIfG_getObjectRes("Dalways", 15); - mpSlimeModel = mDoExt_J3DModel__create(model_data2, 0x80000, 0x11000084); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Dalways", 15); + JUT_ASSERT(0x1BD, modelData != 0); + mpSlimeModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpSlimeModel == NULL) { return cPhs_ERROR_e; } } + if (checkAppear()) { - J3DModelData* eff_model_data = - (J3DModelData*)dComIfG_getObjectRes(model_info->mArcName, model_info->mEffectResNo); - mpEffectModel = mDoExt_J3DModel__create(eff_model_data, 0x80000, 0x11000084); + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(model_info->mArcName, model_info->mEffectResNo); + JUT_ASSERT(0x1CE, modelData != 0); + mpEffectModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpEffectModel == NULL) { return cPhs_ERROR_e; } + mpEffectAnm = new mDoExt_brkAnm(); if (mpEffectAnm == NULL) { return cPhs_ERROR_e; } - J3DAnmTevRegKey* brk_data = - (J3DAnmTevRegKey*)dComIfG_getObjectRes(model_info->mArcName, model_info->mBrkResNo); - if (!mpEffectAnm->init(eff_model_data, brk_data, 1, 0, 0.0f, 0, -1)) { + + J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(model_info->mArcName, model_info->mBrkResNo); + JUT_ASSERT(0x1E1, brk != 0); + if (!mpEffectAnm->init(modelData, brk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 0.0f, 0, -1)) { return cPhs_ERROR_e; } } + mpModel->setBaseScale(scale); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(home.angle.y); mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); + if (mpEffectModel != NULL) { mpEffectModel->setBaseTRMtx(mDoMtx_stack_c::get()); } + mDoMtx_copy(mDoMtx_stack_c::get(), mBgMtx); return cPhs_COMPLEATE_e; } @@ -170,17 +183,21 @@ cPhs__Step daTbox_c::envShapeSet() { /* 804911C8-8049129C 000588 00D4+00 1/1 0/0 0/0 .text bgCheckSet__8daTbox_cFv */ cPhs__Step daTbox_c::bgCheckSet() { daTbox_ModelInfo* model_info = getModelInfo(); - cBgD_t* cbgd = (cBgD_t*)dComIfG_getObjectRes(model_info->mArcName, model_info->mOpenDzbResNo); + + cBgD_t* bgd = (cBgD_t*)dComIfG_getObjectRes(model_info->mArcName, model_info->mOpenDzbResNo); + JUT_ASSERT(0x210, bgd != 0); mpOpenBgW = new dBgW(); if (mpOpenBgW == NULL) { return cPhs_ERROR_e; } - if (mpOpenBgW->Set(cbgd, 1, &mBgMtx) == 1) { + + if (mpOpenBgW->Set(bgd, 1, &mBgMtx) == 1) { return cPhs_ERROR_e; } + mpOpenBgW->SetCrrFunc(dBgS_MoveBGProc_TypicalRotY); mpOpenBgW->Move(); - mpBgCollider = NULL; + mpBgCollision = NULL; return cPhs_COMPLEATE_e; } @@ -197,7 +214,7 @@ void daTbox_c::lightReady() { /* 804912EC-8049135C 0006AC 0070+00 2/2 0/0 0/0 .text setLightPos__8daTbox_cFv */ void daTbox_c::setLightPos() { - cXyz offset = *(cXyz*)&l_light_offset; // temp workaround + cXyz offset(l_light_offset); cXyz pos; cLib_offsetPos(&pos, ¤t.pos, current.angle.y, &offset); mLight.mPosition.set(pos.x, pos.y, pos.z); @@ -223,36 +240,44 @@ int daTbox_c::checkOpen() { /* 804913D0-8049141C 000790 004C+00 3/3 0/0 0/0 .text clrDzb__8daTbox_cFv */ void daTbox_c::clrDzb() { - if (mpBgCollider != NULL) { - dComIfG_Bgsp().Release(mpBgCollider); - mpBgCollider = NULL; + if (mpBgCollision != NULL) { + dComIfG_Bgsp().Release(mpBgCollision); + mpBgCollision = NULL; } } /* 8049141C-80491484 0007DC 0068+00 6/6 0/0 0/0 .text setDzb__8daTbox_cFv */ void daTbox_c::setDzb() { clrDzb(); + if (checkOpen()) { - mpBgCollider = mpOpenBgW; + mpBgCollision = mpOpenBgW; + // "Opened Check Set\n" + OS_REPORT("開いたチェックセット\n"); } else { - mpBgCollider = mpBgW; + mpBgCollision = mpBgW; + // "Closed Check Set\n" + OS_REPORT("閉じたチェックセット\n"); } - dComIfG_Bgsp().Regist(mpBgCollider, this); + + bool rt = dComIfG_Bgsp().Regist(mpBgCollision, this); + JUT_ASSERT(0x285, !rt); } /* 80491484-80491544 000844 00C0+00 1/1 0/0 0/0 .text surfaceProc__8daTbox_cFv */ void daTbox_c::surfaceProc() { - if (mpBgCollider != NULL && flagCheck(0x20)) { + if (mpBgCollision != NULL && flagCheck(0x20)) { if (field_0x750 < -1.0f) { field_0x750 += 1.0f; } else { flagOff(0x20); field_0x750 = 0.0f; } + mDoMtx_stack_c::transS(current.pos.x, current.pos.y + field_0x750, current.pos.z); mDoMtx_stack_c::YrotM(home.angle.y); - mDoMtx_copy(mDoMtx_stack_c::get(), mBgMtx); - mpBgCollider->Move(); + MTXCopy(mDoMtx_stack_c::get(), mBgMtx); + mpBgCollision->Move(); } } @@ -262,9 +287,11 @@ int daTbox_c::checkNormal() { if (func_type == 0 || func_type == 6 || func_type == 5 || func_type == 3) { return true; } - if (getSwNo() >= 0xc0) { + + if (getSwNo() >= 0xC0) { return false; } + if (dComIfGs_isSwitch(getSwNo(), fopAcM_GetRoomNo(this))) { return true; } else { @@ -277,12 +304,15 @@ int daTbox_c::checkEnvEffectTbox() { if (getShapeType() == SHAPE_SMALL) { return false; } - if (getItemNo() == 0x40 || getItemNo() == 0x23 || getItemNo() == 0x24) { + + if (getItemNo() == fpcNm_ITEM_BOOMERANG || getItemNo() == fpcNm_ITEM_MAP || getItemNo() == fpcNm_ITEM_COMPUS) { return true; } + if (getShapeType() == SHAPE_BOSSKEY) { return true; } + return dItem_data::chkFlag(getItemNo(), 0x40); } @@ -291,6 +321,7 @@ u32 daTbox_c::calcHeapSize() { int shape_type = getShapeType(); checkOpen(); checkAppear(); + u32 heap_size = 0; switch (shape_type) { case SHAPE_SMALL: @@ -303,6 +334,7 @@ u32 daTbox_c::calcHeapSize() { heap_size = 0x3060; break; } + return heap_size; } @@ -312,22 +344,26 @@ int daTbox_c::CreateHeap() { if (step != cPhs_COMPLEATE_e) { return false; } + if (checkEnv()) { step = envShapeSet(); if (step != cPhs_COMPLEATE_e) { return false; } } + if (!checkOpen()) { step = effectShapeSet(); if (step != cPhs_COMPLEATE_e) { return false; } } + step = bgCheckSet(); if (step != cPhs_COMPLEATE_e) { return false; } + return true; } @@ -335,9 +371,11 @@ int daTbox_c::CreateHeap() { void daTbox_c::CreateInit() { int func_type = getFuncType(); flagClr(); + mpAnm->setPlaySpeed(0.0f); initPos(); initAnm(); + shape_angle.z = 0; shape_angle.x = 0; current.angle.z = 0; @@ -346,27 +384,29 @@ void daTbox_c::CreateInit() { mStts.Init(0xff, 0xff, this); mCyl.Set(l_cyl_src); mCyl.SetStts(&mStts); - ((cM3dGCyl*)&mCyl)->Set(l_cyl_info[getShapeType()]); + mCyl.cM3dGCyl::Set(l_cyl_info[getShapeType()]); if (mpBgW != NULL) { dComIfG_Bgsp().Release(mpBgW); } + if (flagCheck(2)) { clrDzb(); - } else if (mpBgCollider == NULL) { + } else if (mpBgCollision == NULL) { setDzb(); } if (func_type == 5 || func_type == 6 || field_0x9cc == 1) { mAcchCir.SetWall(500.0f, 0.0f); - mAcch.Set(¤t.pos, &old.pos, this, 1, &mAcchCir, - &speed, ¤t.angle, &shape_angle); + mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, + fopAcM_GetSpeed_p(this), ¤t.angle, &shape_angle); gravity = -2.0f; field_0x97d = true; field_0x97c = true; } else if (func_type == 3) { mAcchCir.SetWall(500.0f, 0.0f); - mAcch.Set(¤t.pos, &old.pos, this, 1, &mAcchCir, &speed, NULL, NULL); + mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, + fopAcM_GetSpeed_p(this), NULL, NULL); } mTboxNo = getTboxNo(); @@ -378,8 +418,10 @@ void daTbox_c::CreateInit() { } initBaseMtx(); + lightReady(); mAllcolRatio = 1.0f; + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); fopAcM_setCullSizeBox(this, l_cull_size_box[0], l_cull_size_box[1], l_cull_size_box[2], l_cull_size_box[3], l_cull_size_box[4], l_cull_size_box[5]); @@ -389,28 +431,44 @@ void daTbox_c::CreateInit() { void daTbox_c::initPos() { int func_type = getFuncType(); if ((func_type == 6 && getSwType() == 15) || func_type == 7) { - dPath* path = dPath_GetRoomPath(getPathId(), -1); + dPath* path_p = dPath_GetRoomPath(getPathId(), -1); + JUT_ASSERT(0x3B7, path_p != 0); + + if (func_type == 6 && path_p->m_num != 2 && path_p->m_num != 3) { + fopAcM_setWarningMessage(this, __FILE__, 0x3BD, "Num of Jump TBox's path point must be 2 or 3!"); + } + if (dComIfGs_isSwitch(getSwNo(), fopAcM_GetRoomNo(this))) { - dStage_dPnt_c* pnt = &path->m_points[path->m_num - 1]; + dStage_dPnt_c* pnt = &path_p->m_points[path_p->m_num - 1]; current.pos = pnt->m_position; home.pos = pnt->m_position; } } else if (func_type == 6 && getSwType() == 0 && checkDrop()) { cXyz pos; - calcJumpGoalAndAngle(&pos, ¤t.angle.y); + if (!calcJumpGoalAndAngle(&pos, ¤t.angle.y)) { + // "Jump Treasure Chest: Failed to get Jump Goal!\n" + OS_REPORT_ERROR("ジャンプ宝箱：ジャンプ先の取得に失敗しました！\n"); + } + current.pos = pos; home.pos = pos; getDropSAngle(&home.angle.y); } - cXyz vec1 = home.pos; - cXyz vec2 = home.pos; - vec1.y += 5.0f; - vec2.y -= 30.0f; - bool line_check = fopAcM_lc_c::lineCheck(&vec1, &vec2, this); + + cXyz start = home.pos; + cXyz end = home.pos; + start.y += 5.0f; + end.y -= 30.0f; + + bool line_check = fopAcM_lc_c::lineCheck(&start, &end, this); if ((line_check && fopAcM_lc_c::checkMoveBG()) || (!line_check && func_type != 3)) { + // "Treasure Chest position initialization: No BG within 25cm, waiting for MoveBG!\n" + OS_REPORT("宝箱位置初期設定：２５ｃｍ以内にＢＧが無いのでMoveBGを待ちます！\n"); field_0x9cc = 1; mMode = MODE_EXEC_WAIT; } else { + // "Treasure Chest position initialization complete!\n" + OS_REPORT("宝箱位置初期設定完了！\n"); field_0x9cc = 0; mMode = MODE_EXEC; } @@ -419,6 +477,7 @@ void daTbox_c::initPos() { /* 80491BB0-80491F68 000F70 03B8+00 1/1 0/0 0/0 .text initAnm__8daTbox_cFv */ void daTbox_c::initAnm() { int func_type = getFuncType(); + if (checkOpen()) { mpAnm->setFrame(mpAnm->getEndFrame()); if (func_type == 3) { @@ -428,18 +487,20 @@ void daTbox_c::initAnm() { shape_angle.z = 0; shape_angle.x = 0; } + home.pos = current.pos; attention_info.position = current.pos; eyePos = current.pos; } - setAction(&actionWait); + + setAction(&daTbox_c::actionWait); int tbox_no = getTboxNo(); dTres_c::offStatus(0, tbox_no, 1); } else if (!checkEnv()) { - setAction(&actionOpenWait); + setAction(&daTbox_c::actionOpenWait); } else if (checkNormal()) { if (func_type == 6 && !checkDrop()) { - setAction(&actionDropWait); + setAction(&daTbox_c::actionDropWait); } else if (func_type == 3) { if (fopAcM_isSwitch(this, getSwNo())) { cXyz pos = current.pos; @@ -448,41 +509,44 @@ void daTbox_c::initAnm() { shape_angle.z = 0; shape_angle.x = 0; } + home.pos = current.pos; attention_info.position = current.pos; eyePos = current.pos; - setAction(&actionOpenWait); + setAction(&daTbox_c::actionOpenWait); } else { - setAction(&actionDropWaitForWeb); + setAction(&daTbox_c::actionDropWaitForWeb); flagOn(2); field_0x9fd = 1; } } else if (func_type == 0) { - setAction(&actionOpenWait); + setAction(&daTbox_c::actionOpenWait); } else { - setAction(&actionOpenWait); + setAction(&daTbox_c::actionOpenWait); } + int tbox_no = getTboxNo(); dTres_c::onStatus(0, tbox_no, 1); } else { int tbox_no = getTboxNo(); dTres_c::offStatus(0, tbox_no, 1); + switch (func_type) { - case 2: - setAction(&actionGenocide); - mTimer = 65; - flagOn(3); - field_0x75a = 120; - break; - case 1: - if (getSwType() == 15) { - setAction(&actionSwOnWait); - } else { - setAction(&actionSwOnWait2); - } - field_0x75a = 120; - flagOn(3); - break; + case 2: + setAction(&daTbox_c::actionGenocide); + mTimer = 65; + flagOn(3); + field_0x75a = 120; + break; + case 1: + if (getSwType() == 15) { + setAction(&daTbox_c::actionSwOnWait); + } else { + setAction(&daTbox_c::actionSwOnWait2); + } + field_0x75a = 120; + flagOn(3); + break; } } } @@ -494,6 +558,7 @@ int daTbox_c::boxCheck() { player->getKandelaarFlamePos() == NULL) { return false; } + cXyz vec = player->attention_info.position - current.pos; f32 dist2_xz = vec.abs2XZ(); f32 dist_y = fabsf(player->current.pos.y - current.pos.y); @@ -510,24 +575,27 @@ void daTbox_c::demoProcOpen() { if (mDemoFrame < 1000) { mDemoFrame++; } - if (mDemoFrame == 0x98) { + + if (mDemoFrame == 152) { dKy_efplight_cut(&mLight); - } else if (mDemoFrame > 0x70) { + } else if (mDemoFrame > 112) { lightDownProc(); } else if (mDemoFrame > 2) { lightUpProc(); } - if (mDemoFrame > 0x16) { + + if (mDemoFrame > 22) { mLight.mPow = cM_ssin(mDemoFrame * 7500) * 21.0f + 70.0f; } + lightColorProc(); environmentProc(); } /* 8049216C-8049233C 00152C 01D0+00 1/1 0/0 0/0 .text lightColorProc__8daTbox_cFv */ -// very badly nonmatching +// NONMATCHING - regalloc void daTbox_c::lightColorProc() { - static s32 const key_frame[7] = {0x00, 0x07, 0x1e, 0x25, 0x2c, 0x5c, 0x8c}; + static int const key_frame[7] = {0x00, 0x07, 0x1e, 0x25, 0x2c, 0x5c, 0x8c}; static GXColorS10 const key_color[7] = { {0x00, 0x00, 0x00, 0xff}, {0xff, 0xc3, 0x8a, 0xff}, @@ -537,31 +605,37 @@ void daTbox_c::lightColorProc() { {0xff, 0xc3, 0x8a, 0xff}, {0x00, 0x00, 0x00, 0xff}, }; - s32 next_key_frame, prev_key_frame, next_key_index, prev_key_index; - if (mDemoFrame < 0x8c) { - for (prev_key_index = 0; prev_key_index < 7; prev_key_index++) { - if (key_frame[prev_key_index] <= mDemoFrame && key_frame[prev_key_index + 1] > mDemoFrame) { - next_key_frame = key_frame[prev_key_index + 1]; - prev_key_frame = key_frame[prev_key_index]; - next_key_index = prev_key_index + 1; + + int var_r25, var_r24, var_r28, var_r30; + if (mDemoFrame < 140) { + for (var_r30 = 0; var_r30 < 7; var_r30++) { + if (key_frame[var_r30] <= mDemoFrame && key_frame[var_r30 + 1] > mDemoFrame) { + var_r25 = key_frame[var_r30]; + var_r24 = key_frame[var_r30 + 1]; + var_r28 = var_r30 + 1; break; } } - u32 num_frames = next_key_frame - prev_key_frame; - s16 step_r = fabs(key_color[prev_key_index + 1].r - key_color[prev_key_index].r) / num_frames; - s16 step_g = fabs(key_color[prev_key_index + 1].g - key_color[prev_key_index].g) / num_frames; - s16 step_b = fabs(key_color[prev_key_index + 1].b - key_color[prev_key_index].b) / num_frames; - cLib_chaseS(&mLight.mColor.r, key_color[next_key_index].r, step_r + 1); - cLib_chaseS(&mLight.mColor.g, key_color[next_key_index].g, step_g + 1); - cLib_chaseS(&mLight.mColor.b, key_color[next_key_index].b, step_b + 1); + + int num_frames = var_r25 - var_r24; + s16 step_r = std::fabs(key_color[var_r30 + 1].r - key_color[var_r30].r) / num_frames; + s16 step_g = std::fabs(key_color[var_r30 + 1].g - key_color[var_r30].g) / num_frames; + s16 step_b = std::fabs(key_color[var_r30 + 1].b - key_color[var_r30].b) / num_frames; + step_r++; + step_g++; + step_b++; + + cLib_chaseS(&mLight.mColor.r, key_color[var_r28].r, step_r); + cLib_chaseS(&mLight.mColor.g, key_color[var_r28].g, step_g); + cLib_chaseS(&mLight.mColor.b, key_color[var_r28].b, step_b); } } /* 8049233C-80492398 0016FC 005C+00 1/1 0/0 0/0 .text environmentProc__8daTbox_cFv */ void daTbox_c::environmentProc() { - if (mDemoFrame > 0x8b) { + if (mDemoFrame > 139) { cLib_addCalc(&mAllcolRatio, 1.0f, 0.05f, 0.1f, 0.05f); - } else if (mDemoFrame > 0xa9) { + } else if (mDemoFrame > 169) { mAllcolRatio = 1.0f; } } @@ -579,63 +653,78 @@ void daTbox_c::lightDownProc() { /* 80492408-80492450 0017C8 0048+00 2/2 0/0 0/0 .text dropProcInitCall__8daTbox_cFv */ void daTbox_c::dropProcInitCall() { switch (getSwType()) { - case 0: - dropProcInit2(); - break; - case 15: - dropProcInit(); - break; + case 0: + dropProcInit2(); + break; + case 15: + dropProcInit(); + break; } } /* 80492450-804928DC 001810 048C+00 1/1 0/0 0/0 .text dropProcInit__8daTbox_cFv */ void daTbox_c::dropProcInit() { - dPath* path = dPath_GetRoomPath(getPathId(), -1); + dPath* path_p = dPath_GetRoomPath(getPathId(), -1); + JUT_ASSERT(0x56A, path_p != 0); + cXyz pos = current.pos; - cXyz pnt1 = path->m_points[1].m_position; - cXyz pnt2; - f32 temp; - if (path->m_num == 2) { + cXyz pnt1 = path_p->m_points[1].m_position; + + f32 var_f30; + if (path_p->m_num == 2) { field_0x97c = false; + f32 delta_y = pos.y - pnt1.y; - f32 abs_gravity = fabsf(fopAcM_GetGravity(this)); - temp = JMAFastSqrt(2.0f * delta_y / abs_gravity); - speedF = pos.absXZ(pnt1) / temp; + f32 abs_gravity = std::fabsf(fopAcM_GetGravity(this)); + + var_f30 = JMAFastSqrt(2.0f * delta_y / abs_gravity); + speedF = pos.absXZ(pnt1) / var_f30; setRotAxis(&pos, &pnt1); - } else if (path->m_num == 3) { - pnt2 = path->m_points[2].m_position; + } else if (path_p->m_num == 3) { + cXyz pnt2(path_p->m_points[2].m_position); + if (pos.y < pnt2.y) { + OS_REPORT_ERROR("落下開始点より落下点の方が上にあります！！！\n"); + JUT_ASSERT(0x58F, 0); + } + f32 delta_y1 = pos.y - pnt2.y; f32 delta_y2 = pnt1.y - pos.y; f32 abs_gravity = fabsf(fopAcM_GetGravity(this)); f32 dist_xz = pos.absXZ(pnt2); + speedF = dist_xz * JMAFastSqrt(abs_gravity) / (JMAFastSqrt(2.0f * delta_y2) + JMAFastSqrt(2.0f * (delta_y1 + delta_y2))); speed.y = JMAFastSqrt(2.0f * abs_gravity * delta_y2); setRotAxis(&pos, &pnt1); - temp = JMAFastSqrt(2.0f / abs_gravity) * + var_f30 = JMAFastSqrt(2.0f / abs_gravity) * (JMAFastSqrt(delta_y1) + JMAFastSqrt(delta_y1 + delta_y2)); } - field_0x9c8 = temp / 19.0f; + + field_0x9c8 = var_f30 / 19.0f; } /* 804928DC-80492B10 001C9C 0234+00 2/2 0/0 0/0 .text calcJumpGoalAndAngle__8daTbox_cFP4cXyzPs */ int daTbox_c::calcJumpGoalAndAngle(cXyz* i_pos, s16* i_angle) { - dPath* path = dPath_GetRoomPath(getPathId(), -1); - if (path != NULL) { - cXyz vec1 = current.pos; - cXyz vec2 = path->m_points[1].m_position; - f32 dist_xz = vec1.absXZ(vec2); + dPath* path_p = dPath_GetRoomPath(getPathId(), -1); + if (path_p != NULL) { + cXyz home_pos = home.pos; + cXyz vec2 = path_p->m_points[1].m_position; + f32 dist_xz = home_pos.absXZ(vec2); + s16 angle; getDropSAngle(&angle); - cXyz vec3(0.0f, 0.0f, dist_xz); + + cXyz goal(0.0f, 0.0f, dist_xz); mDoMtx_stack_c::YrotS(angle); - mDoMtx_stack_c::multVec(&vec3, &vec3); - vec3 += vec1; - vec3.y = vec2.y; - *i_pos = vec3; + mDoMtx_stack_c::multVec(&goal, &goal); + goal += home_pos; + goal.y = vec2.y; + + *i_pos = goal; *i_angle = angle; return true; } + return false; } @@ -645,6 +734,7 @@ bool daTbox_c::getDropSAngle(s16* i_angle) { *i_angle = cM_deg2s((getDir() - 1) * 24 + 12); return true; } + return false; } @@ -681,25 +771,31 @@ void daTbox_c::setRotAxis(cXyz const* i_pos, cXyz const* i_goalPos) { void daTbox_c::dropProcInit2() { cXyz goal_pos; if (!calcJumpGoalAndAngle(&goal_pos, ¤t.angle.y)) { + // "Jump Treasure Chest: Failed to get jump goal!\n" OSReport_Error("ジャンプ宝箱：ジャンプ先の取得に失敗しました！\n"); } - dPath* path = dPath_GetRoomPath(getPathId(), -1); + + dPath* path_p = dPath_GetRoomPath(getPathId(), -1); f32 temp; - if (path->m_num == 2) { + if (path_p->m_num == 2) { cXyz vec1 = current.pos; - cXyz vec2 = path->m_points[1].m_position; + cXyz vec2 = path_p->m_points[1].m_position; field_0x97c = false; f32 delta_y = vec1.y - vec2.y; f32 abs_gravity = fabsf(fopAcM_GetGravity(this)); temp = JMAFastSqrt(2.0f * delta_y / abs_gravity); speedF = vec1.absXZ(vec2) / temp; setRotAxis(&vec1, &goal_pos); + } else { + // "Falling Memory Treasure Chest: There's not 2 points!\n" + OS_REPORT_ERROR("落下方向記憶宝箱：ポイントが２点ではありません！\n"); + JUT_ASSERT(0x641, 0); } + field_0x9c8 = temp / 19.0f; } /* 80492F50-804932C0 002310 0370+00 2/2 0/0 0/0 .text dropProc__8daTbox_cFv */ -// needs ~dBgS_ObjGngChk to be inlined void daTbox_c::dropProc() { if (field_0x9c8 != 0) { s16 temp = field_0x9c6; @@ -718,23 +814,29 @@ void daTbox_c::dropProc() { field_0x9c4 = 0; mDoMtx_identity(field_0x988); speedF = 0.0f; + cXyz vec1(2.0f, 2.0f, 2.0f); dComIfGp_particle_setPolyColor(0xe7, mAcch.m_gnd, ¤t.pos, &tevStr, &home.angle, &vec1, 0, NULL, fopAcM_GetRoomNo(this), NULL); dComIfGp_getVibration().StartShock(4, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); + u32 sound_id = 0; - cXyz vec2 = current.pos; - vec2.y += 10.0f; + cXyz chkpos = current.pos; + chkpos.y += 10.0f; + dBgS_ObjGndChk gnd_chk; - gnd_chk.SetPos(&vec2); + gnd_chk.SetPos(&chkpos); gnd_chk.SetActorPid(base.id); dComIfG_Bgsp().GroundCross(&gnd_chk); + int bg_index = gnd_chk.GetBgIndex(); if (bg_index >= 0 && bg_index < 0x100) { sound_id = dComIfG_Bgsp().GetMtrlSndId(gnd_chk); } - mDoAud_seStart(0x8002f, &eyePos, sound_id, dComIfGp_getReverb(home.roomNo)); + + mDoAud_seStart(JA_SE_OBJ_BLOCK_FALL_NORMAL, &eyePos, sound_id, dComIfGp_getReverb(home.roomNo)); } + if (home.pos.abs(current.pos) > 400.0f) { field_0x97c = true; field_0x97d = true; @@ -745,15 +847,18 @@ void daTbox_c::dropProc() { void daTbox_c::demoInitAppear() { mpEffectAnm->setFrame(0.0f); mpEffectAnm->setPlaySpeed(1.0f); - cXyz vec1(current.pos.x, current.pos.y + 55.0f, current.pos.z); - csXyz vec2 = home.angle; + + cXyz particle_pos(current.pos.x, current.pos.y + 55.0f, current.pos.z); + csXyz particle_rot = home.angle; + static u16 const eff_id[6] = {0x8840, 0x8841, 0x8842, 0x8843, 0x8844, 0x8845}; for (u32 i = 0; i < 6; i++) { - dComIfGp_particle_set(eff_id[i], &vec1, &vec2, &scale, 0xff, NULL, -1, NULL, NULL, NULL); + dComIfGp_particle_set(eff_id[i], &particle_pos, &particle_rot, &scale, 0xff, NULL, -1, NULL, NULL, NULL); } + flagOff(0x40); flagOn(1); - fopAcM_seStart(this, 0x801fd, 0); + fopAcM_seStart(this, Z2SE_OBJ_T_BOX_EMERGE, 0); } /* 80493484-80493518 002844 0094+00 1/1 0/0 0/0 .text demoProcAppear__8daTbox_cFv */ @@ -761,9 +866,11 @@ void daTbox_c::demoProcAppear() { if (field_0x75a != 0) { field_0x75a--; } + if (mpEffectAnm->getFrame() == 110.0f) { flagOff(1); } + if (mpEffectAnm->play()) { mpEffectAnm->setPlaySpeed(0.0f); dComIfGp_evmng_cutEnd(mStaffId); @@ -773,117 +880,133 @@ void daTbox_c::demoProcAppear() { /* 80493518-80493838 0028D8 0320+00 7/7 0/0 0/0 .text demoProc__8daTbox_cFv */ int daTbox_c::demoProc() { static char* action_table[] = {"WAIT", "OPEN", "APPEAR", "OPEN_SHORT", "DROP"}; - int act_idx = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, 5, 0, 0); + int act_idx = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, ARRAY_SIZE(action_table), 0, 0); int tbox_no; + if (dComIfGp_evmng_getIsAddvance(mStaffId)) { field_0x758 = false; switch (act_idx) { - case 1: - OpenInit(); - tbox_no = getTboxNo(); - dTres_c::offStatus(0, tbox_no, 1); - break; - case 2: - flagOn(0x20); - field_0x750 = -130.0f; - setDzb(); - flagOff(2); - tbox_no = getTboxNo(); - dTres_c::onStatus(0, tbox_no, 1); - demoInitAppear(); - break; - case 3: - OpenInit_com(); - tbox_no = getTboxNo(); - dTres_c::offStatus(0, tbox_no, 1); - break; - case 4: - field_0x9ca = 7; - } - } - switch (act_idx) { - case 2: - demoProcAppear(); - surfaceProc(); - break; case 1: - if (field_0x758) { - dComIfGp_evmng_cutEnd(mStaffId); - } else { - if (field_0x97e != 0) { - mpAnm->setFrame(daPy_getPlayerActorClass()->getBaseAnimeFrame()); - } - mpAnm->play(); - if (mpAnm->getFrameCtrl()->checkState(1)) { - field_0x758 = true; - dComIfGp_evmng_cutEnd(mStaffId); - } - } - field_0x97e++; + OpenInit(); + tbox_no = getTboxNo(); + dTres_c::offStatus(0, tbox_no, 1); + break; + case 2: + flagOn(0x20); + field_0x750 = -130.0f; + setDzb(); + flagOff(2); + tbox_no = getTboxNo(); + dTres_c::onStatus(0, tbox_no, 1); + demoInitAppear(); break; case 3: - if (field_0x758) { - dComIfGp_evmng_cutEnd(mStaffId); - } else { - if (field_0x97e != 0) { - mpAnm->setFrame(daPy_getPlayerActorClass()->getBaseAnimeFrame()); - } - mpAnm->play(); - if (mpAnm->getFrameCtrl()->checkState(1)) { - field_0x758 = true; - dComIfGp_evmng_cutEnd(mStaffId); - } - } - field_0x97e++; + OpenInit_com(); + tbox_no = getTboxNo(); + dTres_c::offStatus(0, tbox_no, 1); break; case 4: - if (field_0x9ca > -2) { - field_0x9ca--; - } - if (field_0x9ca == 0) { - dropProcInitCall(); - } else if (field_0x9ca < 0) { - dropProc(); - if (mAcch.ChkGroundHit() && field_0x97d) { - dComIfGp_evmng_cutEnd(mStaffId); - } - } - break; - default: - dComIfGp_evmng_cutEnd(mStaffId); - break; + field_0x9ca = 7; + } } + + switch (act_idx) { + case 2: + demoProcAppear(); + surfaceProc(); + break; + case 1: + if (field_0x758) { + dComIfGp_evmng_cutEnd(mStaffId); + } else { + if (field_0x97e != 0) { + mpAnm->setFrame(daPy_getPlayerActorClass()->getBaseAnimeFrame()); + } + + mpAnm->play(); + + if (mpAnm->getFrameCtrl()->checkState(1)) { + field_0x758 = true; + dComIfGp_evmng_cutEnd(mStaffId); + } + } + + field_0x97e++; + break; + case 3: + if (field_0x758) { + dComIfGp_evmng_cutEnd(mStaffId); + } else { + if (field_0x97e != 0) { + mpAnm->setFrame(daPy_getPlayerActorClass()->getBaseAnimeFrame()); + } + + mpAnm->play(); + + if (mpAnm->getFrameCtrl()->checkState(1)) { + field_0x758 = true; + dComIfGp_evmng_cutEnd(mStaffId); + } + } + + field_0x97e++; + break; + case 4: + if (field_0x9ca > -2) { + field_0x9ca--; + } + + if (field_0x9ca == 0) { + dropProcInitCall(); + } else if (field_0x9ca < 0) { + dropProc(); + if (mAcch.ChkGroundHit() && field_0x97d) { + dComIfGp_evmng_cutEnd(mStaffId); + } + } + break; + default: + dComIfGp_evmng_cutEnd(mStaffId); + break; + } + if (flagCheck(0x10)) { demoProcOpen(); } + if (flagCheck(8)) { dKy_set_allcol_ratio(mAllcolRatio); } + return false; } /* 80493838-804939A4 002BF8 016C+00 2/2 0/0 0/0 .text OpenInit_com__8daTbox_cFv */ void daTbox_c::OpenInit_com() { field_0x97e = 0; + if (!field_0x718) { dComIfGs_onTbox(getTboxNo()); setDzb(); - if (mpBgCollider != NULL) { - mpBgCollider->Move(); + if (mpBgCollision != NULL) { + mpBgCollision->Move(); } } + if (checkEnvEffectTbox()) { mAllcolRatio = 0.55f; dKy_set_allcol_ratio(mAllcolRatio); flagOn(8); dKy_efplight_set(&mLight); + if (getShapeType() == SHAPE_LARGE) { J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(getModelInfo()->mArcName, 9); - mpAnm->init(bck, 1, 0, 1.0f, 0, bck->getFrameMax(), true); - mOpenSeId = 0x80021; + mpAnm->init(bck, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, bck->getFrameMax(), true); + mOpenSeId = Z2SE_OBJ_TBOX_OPEN_B_SLOW; } } + mpAnm->setPlaySpeed(0.0f); fopAcM_seStart(this, mOpenSeId, 0); } @@ -908,41 +1031,44 @@ int daTbox_c::actionDemo() { if (field_0x718) { mpAnm->setPlaySpeed(0.0f); mpAnm->setFrame(0.0f); - setAction(&actionOpenWait); + setAction(&daTbox_c::actionOpenWait); } else { - setAction(&actionWait); + setAction(&daTbox_c::actionWait); } + dComIfGp_event_reset(); dKy_set_allcol_ratio(1.0f); flagOff(0x18); dComIfGp_event_setItemPartner(NULL); - int item_no = getItemNo(); - if (item_no == 0x21) { + + if (getItemNo() == fpcNm_ITEM_KAKERA_HEART) { if (!strcmp(dComIfGp_getStartStageName(), "F_SP121")) { if (fopAcM_GetRoomNo(this) == 0) { switch (getTboxNo()) { - case 3: - dComIfGs_setEventReg(0xedff, dComIfGs_getEventReg(0xedff) | 0x40); - break; - case 2: - dComIfGs_setEventReg(0xebff, dComIfGs_getEventReg(0xebff) | 0x10); - break; - default: - OSReport_Error("ハートの欠片：想定外の配置です。イベントビットセットできませんでした！\n"); - break; + case 3: + dComIfGs_setEventReg(0xedff, dComIfGs_getEventReg(0xedff) | 0x40); + break; + case 2: + dComIfGs_setEventReg(0xebff, dComIfGs_getEventReg(0xebff) | 0x10); + break; + default: + // "Piece of Heart: Unexpected configuration. Couldn't set Event Bit!\n" + OSReport_Error("ハートの欠片：想定外の配置です。イベントビットセットできませんでした！\n"); + break; } } else if (fopAcM_GetRoomNo(this) == 3) { switch (getTboxNo()) { - case 5: - dComIfGs_setEventReg(0xf0ff, dComIfGs_getEventReg(0xf0ff) | 0x80); - break; - default: - OSReport_Error("ハートの欠片：想定外の配置です。イベントビットセットできませんでした！\n"); - break; + case 5: + dComIfGs_setEventReg(0xf0ff, dComIfGs_getEventReg(0xf0ff) | 0x80); + break; + default: + // "Piece of Heart: Unexpected configuration. Couldn't set Event Bit!\n" + OSReport_Error("ハートの欠片：想定外の配置です。イベントビットセットできませんでした！\n"); + break; } } } else if (!strcmp(dComIfGp_getStartStageName(), "F_SP109")) { - if (fopAcM_GetRoomNo(this) == 0 && getTboxNo() == 0x15) { + if (fopAcM_GetRoomNo(this) == 0 && getTboxNo() == 21) { dComIfGs_setEventReg(0xefff, dComIfGs_getEventReg(0xefff) | 0x10); } } @@ -950,19 +1076,21 @@ int daTbox_c::actionDemo() { } else { demoProc(); } + field_0x9f4++; return true; } /* 80493CC8-80493D90 003088 00C8+00 2/0 0/0 0/0 .text actionDemo2__8daTbox_cFv */ int daTbox_c::actionDemo2() { - if ((getEvent() == 0xff && dComIfGp_evmng_endCheck("DEFAULT_TREASURE_APPEAR")) || - (getEvent() != 0xff && dComIfGp_evmng_endCheck(mEventId))) { - setAction(&actionOpenWait); + if ((getEvent() == 0xFF && dComIfGp_evmng_endCheck("DEFAULT_TREASURE_APPEAR")) || + (getEvent() != 0xFF && dComIfGp_evmng_endCheck(mEventId))) { + setAction(&daTbox_c::actionOpenWait); dComIfGp_event_reset(); } else { demoProc(); } + return true; } @@ -970,10 +1098,11 @@ int daTbox_c::actionDemo2() { int daTbox_c::actionDropDemo() { if (mEventId != -1) { if (dComIfGp_evmng_endCheck(mEventId)) { - setAction(&actionOpenWait); + setAction(&daTbox_c::actionOpenWait); dComIfGp_event_reset(); setDzb(); home.pos = current.pos; + if (field_0x9c9 != 0) { camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Start(); @@ -986,7 +1115,7 @@ int daTbox_c::actionDropDemo() { } else { dropProc(); if (mAcch.ChkGroundLanding() && field_0x97d) { - setAction(&actionOpenWait); + setAction(&daTbox_c::actionOpenWait); home.pos = current.pos; } } @@ -994,276 +1123,359 @@ int daTbox_c::actionDropDemo() { } /* 80493ED8-80493FE8 003298 0110+00 5/3 0/0 0/0 .text getBombItemNo__8daTbox_cFUcUc */ -u8 daTbox_c::getBombItemNo(u8 i_bombType, u8 i_slot) { - u8 item_no = i_slot; +u8 daTbox_c::getBombItemNo(u8 i_bombType, u8 i_itemNo) { + u8 new_item_no = i_itemNo; switch (i_bombType) { - case 0x70: - switch (i_slot) { - case 0x16: - case 0x19: - case 0x1a: - case 0x1c: - item_no = 0xa; - break; - case 0x17: - case 0x1b: - item_no = 0xb; - break; - case 0x18: - item_no = 0xc; - break; - case 0x1d: - item_no = 0xd; - break; - } + case fpcNm_ITEM_NORMAL_BOMB: + switch (i_itemNo) { + case fpcNm_ITEM_WATER_BOMB_5: + case fpcNm_ITEM_WATER_BOMB_30: + case fpcNm_ITEM_BOMB_INSECT_5: + case fpcNm_ITEM_BOMB_INSECT_20: + new_item_no = fpcNm_ITEM_BOMB_5; break; - case 0x71: - switch (i_slot) { - case 0x1c: - case 0x1d: - item_no = 0x19; - break; - case 0xa: - case 0x1a: - item_no = 0x16; - break; - case 0xb: - case 0x1b: - item_no = 0x17; - break; - case 0xc: - case 0xd: - item_no = 0x18; - break; - } + case fpcNm_ITEM_WATER_BOMB_10: + case fpcNm_ITEM_BOMB_INSECT_10: + new_item_no = fpcNm_ITEM_BOMB_10; break; - case 0x72: - switch (i_slot) { - case 0x19: - item_no = 0x1c; - break; - case 0xa: - case 0x16: - item_no = 0x1a; - break; - case 0xb: - case 0xc: - case 0xd: - case 0x17: - case 0x18: - item_no = 0x1b; - break; - } + case fpcNm_ITEM_WATER_BOMB_20: + new_item_no = fpcNm_ITEM_BOMB_20; break; - case 0x50: + case fpcNm_ITEM_BOMB_INSECT_30: + new_item_no = fpcNm_ITEM_BOMB_30; break; + } + break; + case fpcNm_ITEM_WATER_BOMB: + switch (i_itemNo) { + case fpcNm_ITEM_BOMB_INSECT_20: + case fpcNm_ITEM_BOMB_INSECT_30: + new_item_no = fpcNm_ITEM_WATER_BOMB_30; + break; + case fpcNm_ITEM_BOMB_5: + case fpcNm_ITEM_BOMB_INSECT_5: + new_item_no = fpcNm_ITEM_WATER_BOMB_5; + break; + case fpcNm_ITEM_BOMB_10: + case fpcNm_ITEM_BOMB_INSECT_10: + new_item_no = fpcNm_ITEM_WATER_BOMB_10; + break; + case fpcNm_ITEM_BOMB_20: + case fpcNm_ITEM_BOMB_30: + new_item_no = fpcNm_ITEM_WATER_BOMB_20; + break; + } + break; + case fpcNm_ITEM_POKE_BOMB: + switch (i_itemNo) { + case fpcNm_ITEM_WATER_BOMB_30: + new_item_no = fpcNm_ITEM_BOMB_INSECT_20; + break; + case fpcNm_ITEM_BOMB_5: + case fpcNm_ITEM_WATER_BOMB_5: + new_item_no = fpcNm_ITEM_BOMB_INSECT_5; + break; + case fpcNm_ITEM_BOMB_10: + case fpcNm_ITEM_BOMB_20: + case fpcNm_ITEM_BOMB_30: + case fpcNm_ITEM_WATER_BOMB_10: + case fpcNm_ITEM_WATER_BOMB_20: + new_item_no = fpcNm_ITEM_BOMB_INSECT_10; + break; + } + break; + case fpcNm_ITEM_BOMB_BAG_LV1: + break; } - return item_no; + + // "Bomb Check\n" + OS_REPORT("\x1b[43;30m爆弾チェック\n"); + if (i_itemNo == new_item_no) { + // "Get bomb %d as is\n" + OS_REPORT("爆弾 %d をそのままゲットします\n\x1b[m", new_item_no); + } else { + // "Bomb %d replaced by %d\n" + OS_REPORT("爆弾 %d を %d に差し替えました\n\x1b[m", i_itemNo, new_item_no); + } + + return new_item_no; } /* 80493FE8-80494144 0033A8 015C+00 1/1 0/0 0/0 .text getBombItemNo2__8daTbox_cFUcUcUc */ -u8 daTbox_c::getBombItemNo2(u8 i_bombType1, u8 i_bombType2, u8 i_slot) { - u8 temp, item_no = i_slot; - switch (i_slot) { - case 0xa: - case 0xb: - case 0xc: - case 0xd: - temp = 0x70; - break; - case 0x16: - case 0x17: - case 0x18: - case 0x19: - temp = 0x71; - break; - case 0x1a: - case 0x1b: - case 0x1c: - case 0x1d: - temp = 0x72; - break; +u8 daTbox_c::getBombItemNo2(u8 i_bombType1, u8 i_bombType2, u8 i_itemNo) { + u8 new_type, new_item_no = i_itemNo; + switch (i_itemNo) { + case fpcNm_ITEM_BOMB_5: + case fpcNm_ITEM_BOMB_10: + case fpcNm_ITEM_BOMB_20: + case fpcNm_ITEM_BOMB_30: + new_type = fpcNm_ITEM_NORMAL_BOMB; + break; + case fpcNm_ITEM_WATER_BOMB_5: + case fpcNm_ITEM_WATER_BOMB_10: + case fpcNm_ITEM_WATER_BOMB_20: + case fpcNm_ITEM_WATER_BOMB_30: + new_type = fpcNm_ITEM_WATER_BOMB; + break; + case fpcNm_ITEM_BOMB_INSECT_5: + case fpcNm_ITEM_BOMB_INSECT_10: + case fpcNm_ITEM_BOMB_INSECT_20: + case fpcNm_ITEM_BOMB_INSECT_30: + new_type = fpcNm_ITEM_POKE_BOMB; + break; } - if (i_bombType1 != temp && i_bombType2 != temp && i_bombType1 != 0x50 && i_bombType2 != 0x50) { - switch (temp) { - case 0x70: - if (i_bombType1 == 0x71 || i_bombType2 == 0x71) { - item_no = getBombItemNo(0x71, i_slot); - } else { - item_no = getBombItemNo(0x72, i_slot); - } - break; - case 0x71: - if (i_bombType1 == 0x70 || i_bombType2 == 0x70) { - item_no = getBombItemNo(0x70, i_slot); - } else { - item_no = getBombItemNo(0x72, i_slot); - } - break; - case 0x72: - if (i_bombType1 == 0x70 || i_bombType2 == 0x70) { - item_no = getBombItemNo(0x70, i_slot); - } else { - item_no = getBombItemNo(0x71, i_slot); - } - break; + // "Bomb Check - 2 Bags\n" + OS_REPORT("\x1b[43;30m爆弾チェック・袋２個\n"); + // "Bomb Type is %d\n" + OS_REPORT("爆弾の種別は %d です\n", new_type); + + if (i_bombType1 == new_type || i_bombType2 == new_type) { + // "There's a bag with the same bomb in it\n" + OS_REPORT("同じ爆弾入りの袋があるのでそこに入れます\n"); + } else if (i_bombType1 == fpcNm_ITEM_BOMB_BAG_LV1 || i_bombType2 == fpcNm_ITEM_BOMB_BAG_LV1) { + // "This is an empty bag so put it in\n" + OS_REPORT("空の袋があるのでそこに入れます\n"); + } else { + switch (new_type) { + case fpcNm_ITEM_NORMAL_BOMB: + if (i_bombType1 == fpcNm_ITEM_WATER_BOMB || i_bombType2 == fpcNm_ITEM_WATER_BOMB) { + new_item_no = getBombItemNo(fpcNm_ITEM_WATER_BOMB, i_itemNo); + } else { + new_item_no = getBombItemNo(fpcNm_ITEM_POKE_BOMB, i_itemNo); + } + break; + case fpcNm_ITEM_WATER_BOMB: + if (i_bombType1 == fpcNm_ITEM_NORMAL_BOMB || i_bombType2 == fpcNm_ITEM_NORMAL_BOMB) { + new_item_no = getBombItemNo(fpcNm_ITEM_NORMAL_BOMB, i_itemNo); + } else { + new_item_no = getBombItemNo(fpcNm_ITEM_POKE_BOMB, i_itemNo); + } + break; + case fpcNm_ITEM_POKE_BOMB: + if (i_bombType1 == fpcNm_ITEM_NORMAL_BOMB || i_bombType2 == fpcNm_ITEM_NORMAL_BOMB) { + new_item_no = getBombItemNo(fpcNm_ITEM_NORMAL_BOMB, i_itemNo); + } else { + new_item_no = getBombItemNo(fpcNm_ITEM_WATER_BOMB, i_itemNo); + } + break; } } - return item_no; + + OS_REPORT("\x1b[m\n"); + return new_item_no; } /* 80494144-804942CC 003504 0188+00 1/1 0/0 0/0 .text getBombItemNo3__8daTbox_cFUcUcUcUc */ -u8 daTbox_c::getBombItemNo3(u8 i_bombType1, u8 i_bombType2, u8 i_bombType3, u8 i_slot) { - u8 temp, item_no = i_slot; - switch (i_slot) { - case 0xa: - case 0xb: - case 0xc: - case 0xd: - temp = 0x70; - break; - case 0x16: - case 0x17: - case 0x18: - case 0x19: - temp = 0x71; - break; - case 0x1a: - case 0x1b: - case 0x1c: - case 0x1d: - temp = 0x72; - break; +u8 daTbox_c::getBombItemNo3(u8 i_bombType1, u8 i_bombType2, u8 i_bombType3, u8 i_itemNo) { + u8 new_type, new_item_no = i_itemNo; + switch (i_itemNo) { + case fpcNm_ITEM_BOMB_5: + case fpcNm_ITEM_BOMB_10: + case fpcNm_ITEM_BOMB_20: + case fpcNm_ITEM_BOMB_30: + new_type = fpcNm_ITEM_NORMAL_BOMB; + break; + case fpcNm_ITEM_WATER_BOMB_5: + case fpcNm_ITEM_WATER_BOMB_10: + case fpcNm_ITEM_WATER_BOMB_20: + case fpcNm_ITEM_WATER_BOMB_30: + new_type = fpcNm_ITEM_WATER_BOMB; + break; + case fpcNm_ITEM_BOMB_INSECT_5: + case fpcNm_ITEM_BOMB_INSECT_10: + case fpcNm_ITEM_BOMB_INSECT_20: + case fpcNm_ITEM_BOMB_INSECT_30: + new_type = fpcNm_ITEM_POKE_BOMB; + break; } - if (i_bombType1 != temp && i_bombType2 != temp && i_bombType3 != temp && - i_bombType1 != 0x50 && i_bombType2 != 0x50 && i_bombType3 != 0x50) { - switch (temp) { - case 0x70: - if (i_bombType1 == 0x71 || i_bombType2 == 0x71 || i_bombType3 == 0x71) { - item_no = getBombItemNo(0x71, i_slot); - } else { - item_no = getBombItemNo(0x72, i_slot); - } - break; - case 0x71: - if (i_bombType1 == 0x70 || i_bombType2 == 0x70 || i_bombType3 == 0x70) { - item_no = getBombItemNo(0x70, i_slot); - } else { - item_no = getBombItemNo(0x72, i_slot); - } - break; - case 0x72: - if (i_bombType1 == 0x70 || i_bombType2 == 0x70 || i_bombType3 == 0x70) { - item_no = getBombItemNo(0x70, i_slot); - } else { - item_no = getBombItemNo(0x71, i_slot); - } - break; + // "Bomb Check - 3 Bags\n" + OS_REPORT("\x1b[43;30m爆弾チェック・袋３個\n"); + // "Bomb Type is %d\n" + OS_REPORT("爆弾の種別は %d です\n", new_type); + + if (i_bombType1 == new_type || i_bombType2 == new_type || i_bombType3 == new_type) { + // "There's a bag with the same bomb in it\n" + OS_REPORT("同じ爆弾入りの袋があるのでそこに入れます\n"); + } else if (i_bombType1 == fpcNm_ITEM_BOMB_BAG_LV1 || i_bombType2 == fpcNm_ITEM_BOMB_BAG_LV1 || i_bombType3 == fpcNm_ITEM_BOMB_BAG_LV1) { + // "This is an empty bag so put it in\n" + OS_REPORT("空の袋があるのでそこに入れます\n"); + } else { + switch (new_type) { + case fpcNm_ITEM_NORMAL_BOMB: + if (i_bombType1 == fpcNm_ITEM_WATER_BOMB || i_bombType2 == fpcNm_ITEM_WATER_BOMB || i_bombType3 == fpcNm_ITEM_WATER_BOMB) { + new_item_no = getBombItemNo(fpcNm_ITEM_WATER_BOMB, i_itemNo); + } else { + new_item_no = getBombItemNo(fpcNm_ITEM_POKE_BOMB, i_itemNo); + } + break; + case fpcNm_ITEM_WATER_BOMB: + if (i_bombType1 == fpcNm_ITEM_NORMAL_BOMB || i_bombType2 == fpcNm_ITEM_NORMAL_BOMB || i_bombType3 == fpcNm_ITEM_NORMAL_BOMB) { + new_item_no = getBombItemNo(fpcNm_ITEM_NORMAL_BOMB, i_itemNo); + } else { + new_item_no = getBombItemNo(fpcNm_ITEM_POKE_BOMB, i_itemNo); + } + break; + case fpcNm_ITEM_POKE_BOMB: + if (i_bombType1 == fpcNm_ITEM_NORMAL_BOMB || i_bombType2 == fpcNm_ITEM_NORMAL_BOMB || i_bombType3 == fpcNm_ITEM_NORMAL_BOMB) { + new_item_no = getBombItemNo(fpcNm_ITEM_NORMAL_BOMB, i_itemNo); + } else { + new_item_no = getBombItemNo(fpcNm_ITEM_WATER_BOMB, i_itemNo); + } + break; } } - return item_no; + + OS_REPORT("\x1b[m\n"); + return new_item_no; } /* 804942CC-804945C8 00368C 02FC+00 1/1 0/0 0/0 .text getBombItemNoMain__8daTbox_cFUc */ -// nonmatching -u8 daTbox_c::getBombItemNoMain(u8 i_slot) { - u8 bomb_type[3], bomb_max[3], bomb_num[3], bomb_count; +u8 daTbox_c::getBombItemNoMain(u8 i_itemNo) { + u8 bomb_type[3], bomb_max[3], bomb_num[3]; + u8 bag_count = 0; + for (int i = 0; i < 3; i++) { - bomb_type[i] = dComIfGs_getItem(0xf + i, false); + bomb_type[i] = dComIfGs_getItem(SLOT_15 + i, false); bomb_max[i] = dComIfGs_getBombMax(bomb_type[i]); bomb_num[i] = dComIfGs_getBombNum(i); - if (bomb_type[i] != 0xff) { - bomb_count++; + + if (bomb_type[i] != fpcNm_ITEM_NONE) { + bag_count++; } } - u8 item_no = i_slot; - switch (bomb_count) { - case 0: - break; - case 1: - item_no = getBombItemNo(bomb_type[0], i_slot); - break; - case 2: - if (bomb_num[0] == bomb_max[0] && bomb_max[0] != 0) { - if (bomb_num[1] != bomb_max[1] || bomb_max[1] == 0) { - item_no = getBombItemNo(bomb_type[1], i_slot); - } - } else if (bomb_num[1] == bomb_max[1] && bomb_max[1] != 0) { - item_no = getBombItemNo(bomb_type[0], i_slot); +#ifdef DEBUG + // "====Bomb Bag count is %d====\n" + OS_REPORT("====バクダン袋の数は %d 個です====\n", bag_count); + for (int i = 0; i < 3; i++) { + // "Bomb Bag<%d> : Type <%d> Max <%d> Current <%d>\n" + OS_REPORT("爆弾袋<%d> : 種別 <%d> 最大 <%d> 現在 <%d>\n", i, bomb_type[i], bomb_max[i], dComIfGs_getBombNum(i)); + } + OS_REPORT("==================================\n"); +#endif + + switch (bag_count) { + case 0: + break; + case 1: + i_itemNo = getBombItemNo(bomb_type[0], i_itemNo); + break; + case 2: + if (bomb_num[0] == bomb_max[0] && bomb_max[0] != 0) { + if (bomb_num[1] == bomb_max[1] && bomb_max[1] != 0) { + // "Both Bomb Bags are full!\n" + OS_REPORT("\x1b[43;30mバクダン袋２つ共一杯でした！\n\x1b[m"); } else { - item_no = getBombItemNo2(bomb_type[0], bomb_type[1], i_slot); + // "Bag 2 Get Bomb!\n" + OS_REPORT("\x1b[43;30m袋２のバクダンをゲット！\n\x1b[m"); + i_itemNo = getBombItemNo(bomb_type[1], i_itemNo); } - break; - case 3: - if (bomb_num[0] == bomb_max[0] && bomb_max[0] != 0) { - if (bomb_num[1] == bomb_max[1] && bomb_max[1] != 0) { - if (bomb_num[2] != bomb_max[2] || bomb_max[2] == 0) { - item_no = getBombItemNo(bomb_type[2], i_slot); - } - } else if (bomb_num[2] == bomb_max[2] && bomb_max[2] != 0) { - item_no = getBombItemNo(bomb_type[1], i_slot); - } else { - item_no = getBombItemNo2(bomb_type[1], bomb_type[2], i_slot); - } - } else if (bomb_num[1] == bomb_max[1] && bomb_max[1] != 0) { + } else if (bomb_num[1] == bomb_max[1] && bomb_max[1] != 0) { + // "Bag 1 Get Bomb!\n" + OS_REPORT("\x1b[43;30m袋１のバクダンをゲット！\n\x1b[m"); + i_itemNo = getBombItemNo(bomb_type[0], i_itemNo); + } else { + // "Bag 1 and 2 Get Bomb!\n" + OS_REPORT("\x1b[43;30m袋１と２のバクダンをゲット！\n\x1b[m"); + i_itemNo = getBombItemNo2(bomb_type[0], bomb_type[1], i_itemNo); + } + break; + case 3: + if (bomb_num[0] == bomb_max[0] && bomb_max[0] != 0) { + if (bomb_num[1] == bomb_max[1] && bomb_max[1] != 0) { if (bomb_num[2] == bomb_max[2] && bomb_max[2] != 0) { - item_no = getBombItemNo(bomb_type[0], i_slot); + // "All 3 Bomb Bags are full!\n" + OS_REPORT("\x1b[43;30mバクダン袋３つ共一杯でした！\n\x1b[m"); } else { - item_no = getBombItemNo2(bomb_type[0], bomb_type[2], i_slot); + // "Bag 3 Get Bomb!\n" + OS_REPORT("\x1b[43;30m袋３のバクダンをゲット！\n\x1b[m"); + i_itemNo = getBombItemNo(bomb_type[2], i_itemNo); } } else if (bomb_num[2] == bomb_max[2] && bomb_max[2] != 0) { - item_no = getBombItemNo2(bomb_type[0], bomb_type[1], i_slot); + // "Bag 2 Get Bomb!\n" + OS_REPORT("\x1b[43;30m袋２のバクダンをゲット！\n\x1b[m"); + i_itemNo = getBombItemNo(bomb_type[1], i_itemNo); } else { - item_no = getBombItemNo3(bomb_type[0], bomb_type[1], bomb_type[2], i_slot); + // "Bag 2 or 3 Get Bomb!\n" + OS_REPORT("\x1b[43;30m袋２か３のバクダンをゲット！\n\x1b[m"); + i_itemNo = getBombItemNo2(bomb_type[1], bomb_type[2], i_itemNo); } - break; + } else if (bomb_num[1] == bomb_max[1] && bomb_max[1] != 0) { + if (bomb_num[2] == bomb_max[2] && bomb_max[2] != 0) { + // "Bag 1 Get Bomb!\n" + OS_REPORT("\x1b[43;30m袋１のバクダンをゲット！\n\x1b[m"); + i_itemNo = getBombItemNo(bomb_type[0], i_itemNo); + } else { + // "Bag 1 and 3 Get Bomb!\n" + OS_REPORT("\x1b[43;30m袋１と３のバクダンをゲット！\n\x1b[m"); + i_itemNo = getBombItemNo2(bomb_type[0], bomb_type[2], i_itemNo); + } + } else if (bomb_num[2] == bomb_max[2] && bomb_max[2] != 0) { + // "Bag 1 and 2 Get Bomb!\n" + OS_REPORT("\x1b[43;30m袋１と２のバクダンをゲット！\n\x1b[m"); + i_itemNo = getBombItemNo2(bomb_type[0], bomb_type[1], i_itemNo); + } else { + // "Bag 1, 2 and 3 Get Bomb!\n" + OS_REPORT("\x1b[43;30m袋１と２と３のバクダンをゲット！\n\x1b[m"); + i_itemNo = getBombItemNo3(bomb_type[0], bomb_type[1], bomb_type[2], i_itemNo); + } + break; + default: + // "Get Item: Wrong number of bomb bags!<%d>\n" + OS_REPORT("\x1b[41;37mゲットアイテム：バクダン袋の数がおかしい！<%d>\n\x1b[m", bag_count); + JUT_ASSERT(0xABD, 0); + break; } - return item_no; + + return i_itemNo; } /* 804945C8-804946A4 003988 00DC+00 1/1 0/0 0/0 .text setGetDemoItem__8daTbox_cFv */ int daTbox_c::setGetDemoItem() { u8 item_no = getItemNo(); - if ((u8)(item_no - 0xa) <= 3 || (u8)(item_no - 0x16) <= 0x6 || item_no == 0x1d) { + if (item_no == fpcNm_ITEM_BOMB_5 || item_no == fpcNm_ITEM_BOMB_10 || item_no == fpcNm_ITEM_BOMB_20 || item_no == fpcNm_ITEM_BOMB_30 || + item_no == fpcNm_ITEM_WATER_BOMB_5 || item_no == fpcNm_ITEM_WATER_BOMB_10 || item_no == fpcNm_ITEM_WATER_BOMB_20 || item_no == fpcNm_ITEM_WATER_BOMB_30 || + item_no == fpcNm_ITEM_BOMB_INSECT_5 || item_no == fpcNm_ITEM_BOMB_INSECT_10 || item_no == fpcNm_ITEM_BOMB_INSECT_20 || item_no == fpcNm_ITEM_BOMB_INSECT_30) + { item_no = getBombItemNoMain(item_no); } - u32 item_id; + fpc_ProcID item_id; if (field_0x718) { item_id = fopAcM_createItemForPresentDemo(¤t.pos, item_no, 1, -1, -1, NULL, NULL); } else { item_id = fopAcM_createItemForTrBoxDemo(¤t.pos, item_no, -1, -1, NULL, NULL); } - if (item_id != -1) { + if (item_id != fpcM_ERROR_PROCESS_ID_e) { dComIfGp_event_setItemPartnerId(item_id); } + return true; } /* 804946A4-804948CC 003A64 0228+00 11/0 0/0 0/0 .text actionOpenWait__8daTbox_cFv */ -// nonmatching -- matches if checkTreasureRupeeReturn has return type bool, -// but that breaks daAlink_c::procCoGetItem int daTbox_c::actionOpenWait() { daMidna_c* midna = daPy_py_c::getMidnaActor(); daPy_py_c* player = daPy_getPlayerActorClass(); + if (eventInfo.i_checkCommandDoor()) { dComIfGp_event_onEventFlag(4); + if (getShapeType() != SHAPE_SMALL && player->i_checkNowWolf() && !midna->checkMetamorphoseEnable()) { - setAction(&actionNotOpenDemo); - mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0); + setAction(&daTbox_c::actionNotOpenDemo); + mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); demoProc(); field_0x9f4 = 0; } else { field_0x718 = player->checkTreasureRupeeReturn(getItemNo()); setGetDemoItem(); - setAction(&actionDemo); - mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0); + setAction(&daTbox_c::actionDemo); + mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); demoProc(); field_0x9f4 = 0; } @@ -1281,13 +1493,14 @@ int daTbox_c::actionOpenWait() { eventInfo.setEventName("DEFAULT_TREASURE_NORMAL"); } } + return true; } /* 804948CC-80494950 003C8C 0084+00 1/0 0/0 0/0 .text actionNotOpenDemo__8daTbox_cFv */ int daTbox_c::actionNotOpenDemo() { if (dComIfGp_evmng_endCheck(mEventId)) { - setAction(&actionOpenWait); + setAction(&daTbox_c::actionOpenWait); dComIfGp_event_reset(); } else { demoProc(); @@ -1308,58 +1521,80 @@ int daTbox_c::checkDrop() { } } } + return false; } /* 80494A0C-80494D88 003DCC 037C+00 1/1 0/0 0/0 .text settingDropDemoCamera__8daTbox_cFv */ -// nonmatching (regalloc) void daTbox_c::settingDropDemoCamera() { camera_class* player_camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); player_camera->mCamera.Stop(); - dStage_MapEvent_dt_c* event_data = - dEvt_control_c::searchMapEventData(getEvent(), fopAcM_GetRoomNo(this)); - player_camera->mCamera.SetTrimSize(event_data->field_0x1); - dStage_roomStatus_c* room_status = dComIfGp_roomControl_getStatusRoomDt(fopAcM_GetRoomNo(this)); - stage_camera_class* stage_camera = room_status->mRoomDt.getCamera(); - stage_camera2_data_class* stage_camera_data = &stage_camera->mEntries[event_data->field_0x16]; - stage_arrow_class* stage_arrow = room_status->mRoomDt.getArrow(); - stage_arrow_data_class* stage_arrow_data = - &stage_arrow->mEntries[stage_camera_data->field_0x10]; - cXyz vec1, vec2, vec4, vec3, vec5, vec6; - vec1.x = stage_arrow_data->mPosition.x; - vec1.z = stage_arrow_data->mPosition.z; - vec2.x = home.pos.x; - vec2.z = home.pos.z; - f32 dist_xz = vec1.abs(vec2); - vec3 = cXyz::BaseY; + + dStage_MapEvent_dt_c* maptooldata = dEvt_control_c::searchMapEventData(getEvent(), fopAcM_GetRoomNo(this)); + JUT_ASSERT(0xB89, maptooldata != 0); + + player_camera->mCamera.SetTrimSize(maptooldata->field_0x1); + + dStage_roomStatus_c* roomdt = dComIfGp_roomControl_getStatusRoomDt(fopAcM_GetRoomNo(this)); + JUT_ASSERT(0xB8E, roomdt != 0); + + stage_camera_class* stage_camera = roomdt->mRoomDt.getCamera(); + stage_camera2_data_class* stage_camera_data = stage_camera->mEntries; + stage_camera_data += maptooldata->field_0x16; + + stage_arrow_class* stage_arrow = roomdt->mRoomDt.getArrow(); + stage_arrow_data_class* stage_arrow_data = stage_arrow->mEntries; + stage_arrow_data += stage_camera_data->field_0x10; + + cXyz spA0; + cXyz spAC; + + spA0.x = stage_arrow_data->mPosition.x; + spA0.z = stage_arrow_data->mPosition.z; + spAC.x = home.pos.x; + spAC.z = home.pos.z; + f32 var_f30 = spA0.abs(spAC); + + cXyz spB8; + cXyz spC4(cXyz::BaseY); + s16 angle; getDropSAngle(&angle); - vec4.x = stage_arrow_data->mPosition.x; - vec4.y = 0.0f; - vec4.z = stage_arrow_data->mPosition.z; - vec4 -= home.pos; + + spB8.x = stage_arrow_data->mPosition.x; + spB8.y = 0.0f; + spB8.z = stage_arrow_data->mPosition.z; + spB8 -= home.pos; + Mtx mtx; - PSMTXRotAxisRad(mtx, &vec3, cM_s2rad(angle)); - mDoMtx_multVec(mtx, &vec4, &vec4); - vec4 += home.pos; - vec4.y = stage_arrow_data->mPosition.y; - vec5 = vec4; - vec6 = home.pos; - s16 arrow_angle = stage_arrow_data->mAngle.x; - f32 dist = dist_xz * (cM_ssin(arrow_angle) / cM_scos(arrow_angle)); - if (arrow_angle > 0) { + MTXRotAxisRad(mtx, &spC4, cM_s2rad(angle)); + mDoMtx_multVec(mtx, &spB8, &spB8); + spB8 += home.pos; + spB8.y = stage_arrow_data->mPosition.y; + + cXyz cam_eye; + cXyz cam_center; + + cam_eye = spB8; + cam_center = home.pos; + + f32 var_f29 = cM_ssin(stage_arrow_data->mAngle.x); + f32 var_f28 = cM_scos(stage_arrow_data->mAngle.x); + f32 dist = var_f30 * (var_f29 / var_f28); + if (stage_arrow_data->mAngle.x > 0) { dist = -dist; } - vec6.y = vec5.y + dist; - player_camera->mCamera.Set(vec6, vec5, 0, (f32)stage_camera_data->field_0x11); + + cam_center.y = cam_eye.y + dist; + player_camera->mCamera.Set(cam_center, cam_eye, 0, (f32)stage_camera_data->field_0x11); field_0x9c9 = 1; } /* 80494D88-80494E98 004148 0110+00 1/0 0/0 0/0 .text actionSwOnWait__8daTbox_cFv */ int daTbox_c::actionSwOnWait() { if (eventInfo.i_checkCommandDemoAccrpt()) { - setAction(&actionDemo2); + setAction(&daTbox_c::actionDemo2); mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); demoProc(); } else if (dComIfGs_isSwitch(getSwNo(), fopAcM_GetRoomNo(this))) { @@ -1370,13 +1605,14 @@ int daTbox_c::actionSwOnWait() { } eventInfo.i_onCondition(2); } + return true; } /* 80494E98-80494F44 004258 00AC+00 1/0 0/0 0/0 .text actionSwOnWait2__8daTbox_cFv */ int daTbox_c::actionSwOnWait2() { if (dComIfGs_isSwitch(getSwNo(), fopAcM_GetRoomNo(this))) { - setAction(&actionOpenWait); + setAction(&daTbox_c::actionOpenWait); setDzb(); flagOff(0x43); int tbox_no = getTboxNo(); @@ -1384,13 +1620,14 @@ int daTbox_c::actionSwOnWait2() { } else { flagOn(0x40); } + return true; } /* 80494F44-80495058 004304 0114+00 1/0 0/0 0/0 .text actionDropWait__8daTbox_cFv */ int daTbox_c::actionDropWait() { if (eventInfo.i_checkCommandDemoAccrpt()) { - setAction(&actionDropDemo); + setAction(&daTbox_c::actionDropDemo); clrDzb(); field_0x97d = false; mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); @@ -1403,17 +1640,18 @@ int daTbox_c::actionDropWait() { eventInfo.i_onCondition(2); } else { dropProcInitCall(); - setAction(&actionDropDemo); + setAction(&daTbox_c::actionDropDemo); field_0x97d = false; } } + return true; } /* 80495058-8049518C 004418 0134+00 1/0 0/0 0/0 .text actionGenocide__8daTbox_cFv */ int daTbox_c::actionGenocide() { if (eventInfo.i_checkCommandDemoAccrpt()) { - setAction(&actionDemo2); + setAction(&daTbox_c::actionDemo2); mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); demoProc(); } else if (!fopAcM_myRoomSearchEnemy(fopAcM_GetRoomNo(this))) { @@ -1442,13 +1680,17 @@ int daTbox_c::actionDropWaitForWeb() { } } else { if (field_0x9fc == 0) { - setAction(&actionDropForWeb); + setAction(&daTbox_c::actionDropForWeb); shape_angle.z = 0; shape_angle.x = 0; fopAcM_SetGravity(this, -2.0f); fopAcM_onSwitch(this, getSwNo()); + + // "Treasure Chest: Falling!<%d>\n" + OS_REPORT("宝箱：落下！<%d>\n", getSwNo()); } } + setBaseMtx(); field_0x9fc = 0; return true; @@ -1458,22 +1700,27 @@ int daTbox_c::actionDropWaitForWeb() { int daTbox_c::actionDropForWeb() { fopAcM_posMoveF(this, NULL); mAcch.CrrPos(dComIfG_Bgsp()); + home.pos = current.pos; attention_info.position = current.pos; eyePos = current.pos; + setBaseMtx(); + if (mAcch.ChkGroundLanding()) { cXyz vec(2.0f, 2.0f, 2.0f); - s32 room_no = fopAcM_GetRoomNo(this); dComIfGp_particle_setPolyColor(0xe7, mAcch.m_gnd, ¤t.pos, &tevStr, &home.angle, - &vec, 0, NULL, room_no, NULL); + &vec, 0, NULL, fopAcM_GetRoomNo(this), NULL); dComIfGp_getVibration().StartShock(4, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); setDzb(); - if (mpBgCollider != NULL) { - mpBgCollider->Move(); + + if (mpBgCollision != NULL) { + mpBgCollision->Move(); } - setAction(&actionOpenWait); + + setAction(&daTbox_c::actionOpenWait); } + dTres_c::setPosition(getTboxNo(), ¤t.pos); return true; } @@ -1483,11 +1730,14 @@ void daTbox_c::initBaseMtx() { field_0x9c4 = 0; mRotAxis = cXyz::BaseX; mDoMtx_identity(field_0x988); + mpModel->setBaseScale(scale); if (mpSlimeModel != NULL) { mpSlimeModel->setBaseScale(scale); } + setBaseMtx(); + if (mpBgW != NULL) { mpBgW->Move(); } @@ -1502,26 +1752,31 @@ void daTbox_c::setBaseMtx() { if (field_0x9c4 == 0) { mDoMtx_identity(mtx); } else { - PSMTXRotAxisRad(mtx, &mRotAxis, cM_s2rad(field_0x9c4)); + MTXRotAxisRad(mtx, &mRotAxis, cM_s2rad(field_0x9c4)); } + s16 angle; - if (getDropSAngle(&angle) && fabsf(speed.y) > 2.0f) { + if (getDropSAngle(&angle) && std::fabs(speed.y) > 2.0f) { cLib_addCalcAngleS(&home.angle.y, angle, 10, 0xc00, 0x400); shape_angle = home.angle; } + mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::transM(0.0f, 50.0f, 0.0f); mDoMtx_stack_c::concat(mtx); mDoMtx_stack_c::concat(field_0x988); mDoMtx_stack_c::ZXYrotM(shape_angle); mDoMtx_stack_c::transM(0.0f, -50.0f, 0.0f); + if (field_0x9fc != 0) { mpModel->setBaseTRMtx(field_0xa00); } else { mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } + mDoMtx_concat(mtx, field_0x988, field_0x988); - mDoMtx_copy(mpModel->getBaseTRMtx(), mBgMtx); + MTXCopy(mpModel->getBaseTRMtx(), mBgMtx); + if (mpSlimeModel != NULL) { mDoMtx_stack_c::transS(current.pos.x, current.pos.y + 15.0f, current.pos.z); mDoMtx_stack_c::ZXYrotM(shape_angle); @@ -1544,18 +1799,21 @@ void daTbox_c::mode_proc_call() { /* 804956EC-80495818 004AAC 012C+00 1/0 0/0 0/0 .text mode_exec_wait__8daTbox_cFv */ void daTbox_c::mode_exec_wait() { bool bvar1 = false; + if (field_0x9cc != 0) { flagOn(0x40); - cXyz vec1(home.pos); - cXyz vec2(home.pos); - vec1.y += 5.0f; - vec2.y -= 30.0f; - if (fopAcM_lc_c::lineCheck(&vec1, &vec2, this) && fopAcM_lc_c::checkMoveBG()) { + cXyz start(home.pos); + cXyz end(home.pos); + start.y += 5.0f; + end.y -= 30.0f; + + if (fopAcM_lc_c::lineCheck(&start, &end, this) && fopAcM_lc_c::checkMoveBG()) { bvar1 = true; home.pos = *fopAcM_lc_c::getCrossP(); current.pos = home.pos; } } + if (bvar1) { flagOff(0x40); mMode = MODE_EXEC; @@ -1566,19 +1824,24 @@ void daTbox_c::mode_exec_wait() { /* 80495818-80495910 004BD8 00F8+00 2/1 0/0 0/0 .text mode_exec__8daTbox_cFv */ void daTbox_c::mode_exec() { action(); + if (getFuncType() == 5 || getFuncType() == 6 || field_0x9cc == 1) { fopAcM_posMoveF(this, NULL); + if (field_0x97c) { mAcch.CrrPos(dComIfG_Bgsp()); } else { mAcch.i_ClrGroundHit(); } + attention_info.position = current.pos; eyePos = current.pos; setBaseMtx(); - if (mpBgCollider == mpOpenBgW) { - mpBgCollider->Move(); + + if (mpBgCollision == mpOpenBgW) { + mpBgCollision->Move(); } + dTres_c::setPosition(getTboxNo(), ¤t.pos); } } @@ -1592,16 +1855,24 @@ cPhs__Step daTbox_c::create1st() { home.angle.x = 0; mParamsInit = true; } + + if (getShapeType() > 2) { + OS_REPORT("\x1b[43;30mTbox Type Error!!!<%d>\n\x1b[m", getShapeType()); + JUT_ASSERT(0xDD8, 0); + } + daTbox_ModelInfo* model_info = getModelInfo(); cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, model_info->mArcName); if (step != cPhs_COMPLEATE_e) { return step; } + step = (cPhs__Step)MoveBGCreate(model_info->mArcName, model_info->mClosedDzbResNo, dBgS_MoveBGProc_TypicalRotY, calcHeapSize(), NULL); if (step == cPhs_ERROR_e) { return step; } + CreateInit(); attention_info.flags = 0x40; attention_info.flags |= 0x400000; @@ -1609,17 +1880,20 @@ cPhs__Step daTbox_c::create1st() { } /* 804959EC-80495AF0 004DAC 0104+00 1/0 0/0 0/0 .text Execute__8daTbox_cFPPA3_A4_f */ -int daTbox_c::Execute(f32 (**param_0)[3][4]) { +int daTbox_c::Execute(Mtx** param_0) { mode_proc_call(); *param_0 = &mBgMtx; + cXyz center(l_cyl_info[getShapeType()].mCenter); mDoMtx_stack_c::YrotS(shape_angle.y); mDoMtx_stack_c::multVec(¢er, ¢er); center += current.pos; + if ((getSwNo() != 0xff && fopAcM_isSwitch(this, getSwNo())) || getSwNo() == 0xff) { mCyl.SetC(center); dComIfG_Ccsp()->Set(&mCyl); } + return true; } @@ -1628,26 +1902,34 @@ int daTbox_c::Draw() { if (flagCheck(0x40)) { return true; } + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + if (mpEffectModel != NULL && mpEffectAnm->getPlaySpeed() != 0.0f) { g_env_light.setLightTevColorType_MAJI(mpEffectModel, &tevStr); mpEffectAnm->entry(mpEffectModel->getModelData()); mDoExt_modelUpdateDL(mpEffectModel); mDoExt_brkAnmRemove(mpEffectModel->getModelData()); } + if (flagCheck(1)) { return true; } + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); + if (mpSlimeModel != NULL) { dComIfGd_setXluListBG(); mDoExt_modelUpdateDL(mpSlimeModel); dComIfGd_setList(); } + mpAnm->entry(mpModel->getModelData()); + if (getShapeType() == SHAPE_BOSSKEY) { fopAcM_setEffectMtx(this, mpModel->getModelData()); } + dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); @@ -1656,9 +1938,10 @@ int daTbox_c::Draw() { /* 80495C9C-80495CFC 00505C 0060+00 1/0 0/0 0/0 .text Delete__8daTbox_cFv */ int daTbox_c::Delete() { - if (mpBgCollider != NULL) { - dComIfG_Bgsp().Release(mpBgCollider); + if (mpBgCollision != NULL) { + dComIfG_Bgsp().Release(mpBgCollision); } + dComIfG_resDelete(&mPhase, getModelInfo()->mArcName); return true; } @@ -1670,19 +1953,19 @@ cPhs__Step daTbox_create1st(daTbox_c* i_this) { } /* 80496004-80496024 0053C4 0020+00 1/0 0/0 0/0 .text daTbox_MoveBGDelete__FP8daTbox_c */ -static void daTbox_MoveBGDelete(daTbox_c* i_this) { - i_this->MoveBGDelete(); +static int daTbox_MoveBGDelete(daTbox_c* i_this) { + return i_this->MoveBGDelete(); } /* 80496024-80496044 0053E4 0020+00 1/0 0/0 0/0 .text daTbox_MoveBGExecute__FP8daTbox_c */ -static void daTbox_MoveBGExecute(daTbox_c* i_this) { - i_this->MoveBGExecute(); +static int daTbox_MoveBGExecute(daTbox_c* i_this) { + return i_this->MoveBGExecute(); } /* 80496044-80496070 005404 002C+00 1/0 0/0 0/0 .text daTbox_MoveBGDraw__FP8daTbox_c */ -static void daTbox_MoveBGDraw(daTbox_c* i_this) { - i_this->MoveBGDraw(); +static int daTbox_MoveBGDraw(daTbox_c* i_this) { + return i_this->MoveBGDraw(); } /* 804961B0-804961B8 005570 0008+00 1/0 0/0 0/0 .text Create__8daTbox_cFv */ @@ -1721,3 +2004,5 @@ extern actor_process_profile_definition g_profile_TBOX = { fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, }; + +AUDIO_INSTANCES diff --git a/src/d/d_bg_plc.cpp b/src/d/d_bg_plc.cpp index ae69d34d34..eb8ebc8342 100644 --- a/src/d/d_bg_plc.cpp +++ b/src/d/d_bg_plc.cpp @@ -1,7 +1,3 @@ -// -// Translation Unit: d/d_bg_plc -// - #include "d/d_bg_plc.h" #include "JSystem/JUtility/JUTAssert.h" @@ -14,19 +10,20 @@ dBgPlc::dBgPlc() { dBgPlc::~dBgPlc() {} /* 800740BC-800740C4 -00001 0008+00 0/0 0/0 0/0 .text setBase__6dBgPlcFPv */ -void dBgPlc::setBase(void* p_base) { - m_base = (PLC*)p_base; +void dBgPlc::setBase(void* pbase) { + m_base = (sBgPlc*)pbase; } /* 800740C4-800740DC 06EA04 0018+00 0/0 1/1 0/0 .text getCode__6dBgPlcCFiPP5sBgPc */ -sBgPc* dBgPlc::getCode(int index, sBgPc** param_1) const { +sBgPc* dBgPlc::getCode(int index, sBgPc** ppcode) const { JUT_ASSERT(45, m_base != 0); JUT_ASSERT(46, m_base->m_code_size == ZELDA_CODE_SIZE); JUT_ASSERT(47, index >= 0 && index< m_base->m_num); - sBgPc* rv = m_base->field_0x8; - rv += index; - *param_1 = rv; - return rv; + sBgPc* code = m_base->m_code; + code += index; + + *ppcode = code; + return code; } /* 800740DC-800740F4 06EA1C 0018+00 0/0 1/1 0/0 .text getGrpCode__6dBgPlcCFi */ @@ -34,7 +31,8 @@ u32 dBgPlc::getGrpCode(int index) const { JUT_ASSERT(62, m_base != 0); JUT_ASSERT(63, m_base->m_code_size == ZELDA_CODE_SIZE); JUT_ASSERT(64, 0 <= index && index < m_base->m_num); - sBgPc* rv = m_base->field_0x8; - rv += index; - return rv->code4; -} \ No newline at end of file + sBgPc* code = m_base->m_code; + code += index; + + return code->code4; +} diff --git a/src/d/d_bg_w_kcol.cpp b/src/d/d_bg_w_kcol.cpp index a4f757e694..c0948b2017 100644 --- a/src/d/d_bg_w_kcol.cpp +++ b/src/d/d_bg_w_kcol.cpp @@ -1,136 +1,8 @@ -// -// Generated By: dol2asm -// Translation Unit: d/d_bg_w_kcol -// - #include "d/d_bg_w_kcol.h" #include "d/d_com_inf_game.h" #include "dol2asm.h" #include "d/actor/d_a_horse.h" - -// -// Forward References: -// - -extern "C" void __ct__8dBgWKColFv(); -extern "C" void __dt__8dBgWKColFv(); -extern "C" void initKCollision__8dBgWKColFPv(); -extern "C" void create__8dBgWKColFPvPv(); -extern "C" void getTriNrm__8dBgWKColCFP12KC_PrismDataPP3Vec(); -extern "C" void ChkNotReady__8dBgWKColCFv(); -extern "C" bool ChkLock__8dBgWKColCFv(); -extern "C" bool ChkMoveBg__8dBgWKColCFv(); -extern "C" bool ChkMoveFlag__8dBgWKColCFv(); -extern "C" void GetTriPla__8dBgWKColCFRC13cBgS_PolyInfo(); -extern "C" void GetTriPla__8dBgWKColCFi(); -extern "C" void GetTriPnt__8dBgWKColCFRC13cBgS_PolyInfoP4cXyzP4cXyzP4cXyz(); -extern "C" void GetTriPnt__8dBgWKColCFiP3VecP3VecP3Vec(); -extern "C" void GetTriPnt__8dBgWKColCFPC12KC_PrismDataP3VecP3VecP3Vec(); -extern "C" void GetBnd__8dBgWKColCFv(); -extern "C" void GetGrpInf__8dBgWKColCFRC13cBgS_PolyInfo(); -extern "C" void OffMoveFlag__8dBgWKColFv(); -extern "C" void getPolyCode__8dBgWKColCFiP5dBgPc(); -extern "C" void chkPolyThrough__8dBgWKColCFP5dBgPcP16cBgS_PolyPassChkP15cBgS_GrpPassChkR4cXyz(); -extern "C" void LineCheck__8dBgWKColFP11cBgS_LinChk(); -extern "C" void GroundCross__8dBgWKColFP11cBgS_GndChk(); -extern "C" void ShdwDraw__8dBgWKColFP13cBgS_ShdwDraw(); -extern "C" void ChkShdwDrawThrough__8dBgWKColFP5dBgPc(); -extern "C" void CaptPoly__8dBgWKColFR13dBgS_CaptPoly(); -extern "C" void WallCorrectSort__8dBgWKColFP9dBgS_Acch(); -extern "C" void WallCorrect__8dBgWKColFP9dBgS_Acch(); -extern "C" void RoofChk__8dBgWKColFP12dBgS_RoofChk(); -extern "C" void SplGrpChk__8dBgWKColFP14dBgS_SplGrpChk(); -extern "C" void SphChk__8dBgWKColFP11dBgS_SphChkPv(); -extern "C" void GetTopUnder__8dBgWKColCFPfPf(); -extern "C" void GetGrpRoomIndex__8dBgWKColCFRC13cBgS_PolyInfo(); -extern "C" void GetExitId__8dBgWKColFRC13cBgS_PolyInfo(); -extern "C" void GetPolyColor__8dBgWKColFRC13cBgS_PolyInfo(); -extern "C" void GetHorseNoEntry__8dBgWKColFRC13cBgS_PolyInfo(); -extern "C" void GetSpecialCode__8dBgWKColFRC13cBgS_PolyInfo(); -extern "C" void GetSpecialCode__8dBgWKColFi(); -extern "C" void GetMagnetCode__8dBgWKColFRC13cBgS_PolyInfo(); -extern "C" void GetMonkeyBarsCode__8dBgWKColFRC13cBgS_PolyInfo(); -extern "C" void GetPolyObjThrough__8dBgWKColFi(); -extern "C" void GetPolyCamThrough__8dBgWKColFi(); -extern "C" void GetPolyLinkThrough__8dBgWKColFi(); -extern "C" void GetPolyArrowThrough__8dBgWKColFi(); -extern "C" void GetPolyHSStick__8dBgWKColFi(); -extern "C" void GetPolyBoomerangThrough__8dBgWKColFi(); -extern "C" void GetPolyRopeThrough__8dBgWKColFi(); -extern "C" void GetPolyBombThrough__8dBgWKColFi(); -extern "C" void GetUnderwaterRoofCode__8dBgWKColFi(); -extern "C" void GetShdwThrough__8dBgWKColFi(); -extern "C" void GetLinkNo__8dBgWKColFRC13cBgS_PolyInfo(); -extern "C" void GetWallCode__8dBgWKColFRC13cBgS_PolyInfo(); -extern "C" void GetPolyAtt0__8dBgWKColFRC13cBgS_PolyInfo(); -extern "C" void GetPolyAtt1__8dBgWKColFRC13cBgS_PolyInfo(); -extern "C" void GetGroundCode__8dBgWKColFRC13cBgS_PolyInfo(); -extern "C" void GetIronBallThrough__8dBgWKColFi(); -extern "C" void GetAttackThrough__8dBgWKColFi(); -extern "C" void GetCamMoveBG__8dBgWKColFRC13cBgS_PolyInfo(); -extern "C" void GetRoomCamId__8dBgWKColFRC13cBgS_PolyInfo(); -extern "C" void GetRoomPathId__8dBgWKColFRC13cBgS_PolyInfo(); -extern "C" void GetRoomPathPntNo__8dBgWKColFRC13cBgS_PolyInfo(); -extern "C" void GetPolyGrpRoomInfId__8dBgWKColFRC13cBgS_PolyInfo(); -extern "C" void GetGrpSoundId__8dBgWKColFRC13cBgS_PolyInfo(); -extern "C" void CrrPos__8dBgWKColFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz(); -extern "C" void TransPos__8dBgWKColFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz(); -extern "C" void MatrixCrrPos__8dBgWKColFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz(); - -// -// External References: -// - -extern "C" void setCode__5dBgPcFR5sBgPc(); -extern "C" void __ct__6dBgPlcFv(); -extern "C" void __dt__6dBgPlcFv(); -extern "C" void setBase__6dBgPlcFPv(); -extern "C" void getCode__6dBgPlcCFiPP5sBgPc(); -extern "C" void getGrpCode__6dBgPlcCFi(); -extern "C" void SetOldShapeAngleY__9dBgW_BaseFs(); -extern "C" void GetSpeedY__9dBgS_AcchFv(); -extern "C" void GetWallAddY__9dBgS_AcchFR3Vec(); -extern "C" void SetWallPolyIndex__9dBgS_AcchFii(); -extern "C" void CalcMovePosWork__9dBgS_AcchFv(); -extern "C" void ChkNoHorse__16dBgS_PolyPassChkFv(); -extern "C" void __ct__9dBgW_BaseFv(); -extern "C" void __dt__9dBgW_BaseFv(); -extern "C" void ClrDBgWBase__9dBgW_BaseFv(); -extern "C" bool ChkMemoryError__9dBgW_BaseFv(); -extern "C" void CallRideCallBack__9dBgW_BaseFP10fopAc_ac_cP10fopAc_ac_c(); -extern "C" void CallArrowStickCallBack__9dBgW_BaseFP10fopAc_ac_cP10fopAc_ac_cR4cXyz(); -extern "C" void cM_atan2s__Fff(); -extern "C" void SetPolyIndex__13cBgS_PolyInfoFi(); -extern "C" void cBgW_CheckBGround__Ff(); -extern "C" void cBgW_CheckBRoof__Ff(); -extern "C" void cBgW_CheckBWall__Ff(); -extern "C" void cM2d_CrossCirLin__FR8cM2dGCirffffPfPf(); -extern "C" void cM3d_Len2dSq__Fffff(); -extern "C" void cM3d_Len2dSqPntAndSegLine__FffffffPfPfPf(); -extern "C" void cM3d_Cross_SphTri__FPC8cM3dGSphPC8cM3dGTriP3Vec(); -extern "C" void calcMinMax__8cM3dGCylFP4cXyzP4cXyz(); -extern "C" void SetupNP__8cM3dGPlaFRC3VecRC3Vec(); -extern "C" void GetMinMaxCube__8cM3dGSphCFR4cXyzR4cXyz(); -extern "C" void set__8cM3dGTriFPC3VecPC3VecPC3VecPC3Vec(); -extern "C" void __dl__FPv(); -extern "C" void __ptmf_scall(); -extern "C" void __cvt_fp2unsigned(); -extern "C" void _savegpr_14(); -extern "C" void _savegpr_19(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_14(); -extern "C" void _restgpr_19(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__8cM3dGPla[3]; -extern "C" extern void* __vt__8cM3dGAab[3]; -extern "C" extern void* __vt__8cM3dGTri[3]; -extern "C" u8 sincosTable___5JMath[65536]; - -// -// Declarations: -// +#include "d/d_bg_s_cap_poly.h" /* 8007E6F4-8007E74C 079034 0058+00 0/0 0/0 1/1 .text __ct__8dBgWKColFv */ dBgWKCol::dBgWKCol() { @@ -142,27 +14,35 @@ dBgWKCol::~dBgWKCol() {} /* 8007E7D0-8007E804 079110 0034+00 0/0 1/1 0/0 .text initKCollision__8dBgWKColFPv */ void* dBgWKCol::initKCollision(void* i_kclData) { - KCol_Header* header_p = (KCol_Header*)i_kclData; + KC_Header* header_p = (KC_Header*)i_kclData; - header_p->pos_data_offset = (u32)header_p + header_p->pos_data_offset; - header_p->nrm_data_offset = (u32)header_p + header_p->nrm_data_offset; - header_p->prism_data_offset = (u32)header_p + header_p->prism_data_offset; - header_p->block_data_offset = (u32)header_p + header_p->block_data_offset; + header_p->m_pos_data = (Vec*)((u32)header_p + (u32)header_p->m_pos_data); + header_p->m_nrm_data = (Vec*)((u32)header_p + (u32)header_p->m_nrm_data); + header_p->m_prism_data = (KC_PrismData*)((u32)header_p + (u32)header_p->m_prism_data); + header_p->m_block_data = (KC_PrismData*)((u32)header_p + (u32)header_p->m_block_data); return i_kclData; } /* 8007E804-8007E850 079144 004C+00 0/0 0/0 1/1 .text create__8dBgWKColFPvPv */ void dBgWKCol::create(void* pprism, void* plc) { + JUT_ASSERT(0x43, pprism != 0); + JUT_ASSERT(0x44, plc != 0); + ClrDBgWBase(); - m_pkc_head = (pkcdata*)pprism; + m_pkc_head = (KC_Header*)pprism; + + u32 poly_num = ((u32)m_pkc_head->m_block_data - (u32)m_pkc_head->m_prism_data) / 0xC; + poly_num++; + JUT_ASSERT(0x50, poly_num <= 0x4000); + m_code.setBase(plc); } /* 8007E850-8007E86C 079190 001C+00 1/1 0/0 0/0 .text getTriNrm__8dBgWKColCFP12KC_PrismDataPP3Vec */ void dBgWKCol::getTriNrm(KC_PrismData* pkc, Vec** nrm) const { - *nrm = &m_pkc_head->field_0x4[pkc->field_0x6]; + *nrm = &m_pkc_head->m_nrm_data[pkc->fnrm_i]; } /* 8007E86C-8007E87C 0791AC 0010+00 1/0 0/0 0/0 .text ChkNotReady__8dBgWKColCFv */ @@ -186,7 +66,7 @@ u32 dBgWKCol::ChkMoveFlag() const { } /* 8007E894-8007E8C0 0791D4 002C+00 1/0 0/0 0/0 .text GetTriPla__8dBgWKColCFRC13cBgS_PolyInfo */ -cM3dGPla dBgWKCol::GetTriPla(cBgS_PolyInfo const& poly) const { +cM3dGPla dBgWKCol::GetTriPla(const cBgS_PolyInfo& poly) const { int poly_index = poly.GetPolyIndex(); return GetTriPla(poly_index); } @@ -210,46 +90,51 @@ cM3dGPla dBgWKCol::GetTriPla(int poly_index) const { /* 8007E980-8007E9A4 0792C0 0024+00 1/0 0/0 0/0 .text * GetTriPnt__8dBgWKColCFRC13cBgS_PolyInfoP4cXyzP4cXyzP4cXyz */ -bool dBgWKCol::GetTriPnt(cBgS_PolyInfo const& poly, cXyz* param_1, cXyz* param_2, +bool dBgWKCol::GetTriPnt(const cBgS_PolyInfo& poly, cXyz* ppos, cXyz* param_2, cXyz* param_3) const { int poly_index = poly.GetPolyIndex(); - return GetTriPnt(poly_index, param_1, param_2, param_3); + return GetTriPnt(poly_index, ppos, param_2, param_3); } /* 8007E9A4-8007E9D4 0792E4 0030+00 3/3 0/0 0/0 .text GetTriPnt__8dBgWKColCFiP3VecP3VecP3Vec */ -bool dBgWKCol::GetTriPnt(int poly_index, Vec* param_1, Vec* param_2, Vec* param_3) const { +bool dBgWKCol::GetTriPnt(int poly_index, Vec* ppos, Vec* param_2, Vec* param_3) const { KC_PrismData* pd = getPrismData(poly_index); - return GetTriPnt(pd, param_1, param_2, param_3); + return GetTriPnt(pd, ppos, param_2, param_3); } /* 8007E9D4-8007EB28 079314 0154+00 3/3 0/0 0/0 .text * GetTriPnt__8dBgWKColCFPC12KC_PrismDataP3VecP3VecP3Vec */ -bool dBgWKCol::GetTriPnt(KC_PrismData const* param_1, Vec* param_2, Vec* param_3, +bool dBgWKCol::GetTriPnt(KC_PrismData const* pd, Vec* ppos, Vec* param_3, Vec* param_4) const { - pkcdata* pkcData = m_pkc_head; - *param_2 = pkcData->field_0x0[param_1->field_0x4]; - Vec* vec6 = &pkcData->field_0x4[param_1->field_0x6]; - Vec* veca = &pkcData->field_0x4[param_1->field_0xa]; - Vec* vecc = &pkcData->field_0x4[param_1->field_0xc]; + *ppos = m_pkc_head->m_pos_data[pd->pos_i]; - Vec auStack_64; - VECCrossProduct(vec6, &pkcData->field_0x4[param_1->field_0x8], &auStack_64); - Vec auStack_70; - VECCrossProduct(veca, vec6, &auStack_70); - f32 dVar11 = VECDotProduct(&auStack_64,vecc); - if (cM3d_IsZero(dVar11)) { + Vec* face_nrm = &m_pkc_head->m_nrm_data[pd->fnrm_i]; + Vec* edge_nrm1 = &m_pkc_head->m_nrm_data[pd->enrm1_i]; + Vec* edge_nrm2 = &m_pkc_head->m_nrm_data[pd->enrm2_i]; + Vec* edge_nrm3 = &m_pkc_head->m_nrm_data[pd->enrm3_i]; + + Vec sp64; + VECCrossProduct(face_nrm, edge_nrm1, &sp64); + + Vec sp70; + VECCrossProduct(edge_nrm2, face_nrm, &sp70); + + f32 var_f30 = VECDotProduct(&sp64, edge_nrm3); + if (cM3d_IsZero(var_f30)) { return false; } - dVar11 = param_1->field_0x0 / dVar11; - VECScale(&auStack_64, &auStack_64, dVar11); - VECAdd(&auStack_64, param_2, param_4); - dVar11 = VECDotProduct(&auStack_70,vecc); - if (cM3d_IsZero(dVar11)) { + + var_f30 = pd->height / var_f30; + VECScale(&sp64, &sp64, var_f30); + VECAdd(&sp64, ppos, param_4); + var_f30 = VECDotProduct(&sp70, edge_nrm3); + if (cM3d_IsZero(var_f30)) { return false; } - dVar11 = param_1->field_0x0 / dVar11; - VECScale(&auStack_70, &auStack_70, dVar11); - VECAdd(&auStack_70, param_2, param_3); + + var_f30 = pd->height / var_f30; + VECScale(&sp70, &sp70, var_f30); + VECAdd(&sp70, ppos, param_3); return true; } @@ -259,11 +144,11 @@ cM3dGAab* dBgWKCol::GetBnd() const { } /* 8007EB30-8007EB6C 079470 003C+00 1/0 0/0 0/0 .text GetGrpInf__8dBgWKColCFRC13cBgS_PolyInfo */ -u32 dBgWKCol::GetGrpInf(cBgS_PolyInfo const& poly) const { +u32 dBgWKCol::GetGrpInf(const cBgS_PolyInfo& poly) const { u16 poly_index = poly.GetPolyIndex(); KC_PrismData* pd = getPrismData(poly_index); - return m_code.getGrpCode(pd->field_0xe); + return m_code.getGrpCode(pd->attribute); } /* 8007EB6C-8007EB70 0794AC 0004+00 1/0 0/0 0/0 .text OffMoveFlag__8dBgWKColFv */ @@ -271,206 +156,452 @@ void dBgWKCol::OffMoveFlag() {} /* 8007EB70-8007EBC4 0794B0 0054+00 39/39 0/0 0/0 .text getPolyCode__8dBgWKColCFiP5dBgPc */ -void dBgWKCol::getPolyCode(int poly_index, dBgPc* pbgpc) const { +void dBgWKCol::getPolyCode(int poly_index, dBgPc* ppoly) const { KC_PrismData* pd = getPrismData(poly_index); sBgPc* code; - m_code.getCode(pd->field_0xe, &code); - pbgpc->setCode(*code); + m_code.getCode(pd->attribute, &code); + ppoly->setCode(*code); } /* 8007EBC4-8007EE34 079504 0270+00 8/8 0/0 0/0 .text * chkPolyThrough__8dBgWKColCFP5dBgPcP16cBgS_PolyPassChkP15cBgS_GrpPassChkR4cXyz */ -bool dBgWKCol::chkPolyThrough(dBgPc* ppoly, cBgS_PolyPassChk* param_2, - cBgS_GrpPassChk* param_3, cXyz& param_4) const { +bool dBgWKCol::chkPolyThrough(dBgPc* ppoly, cBgS_PolyPassChk* ppolypasschk, + cBgS_GrpPassChk* pgrppasschk, cXyz& param_4) const { JUT_ASSERT(279, ppoly != 0); - if (param_3 != NULL) { + if (pgrppasschk != NULL) { if (ppoly->maskNrm() == 0) { - if (((dBgS_GrpPassChk*)param_3)->MaskNormalGrp() == 0) { + if (((dBgS_GrpPassChk*)pgrppasschk)->MaskNormalGrp() == 0) { return true; } } else if (ppoly->getWtr() != 0 && - (((dBgS_GrpPassChk*)param_3)->MaskWaterGrp() == 0)) + (((dBgS_GrpPassChk*)pgrppasschk)->MaskWaterGrp() == 0)) { return true; } } - if (param_2 != NULL) { - dBgS_PolyPassChk* polypass = (dBgS_PolyPassChk*)param_2; - if (polypass->ChkObj() && ppoly->getObjThrough() != 0) { + + if (ppolypasschk != NULL) { + dBgS_PolyPassChk* polypass = (dBgS_PolyPassChk*)ppolypasschk; + if (polypass->ChkObj() && ppoly->getObjThrough()) { return true; } - if (polypass->ChkCam() && ppoly->getCamThrough() != 0) { + + if (polypass->ChkCam() && ppoly->getCamThrough()) { return true; } - if ((polypass->ChkLink() && ppoly->getLinkThrough() != 0) || - (polypass->ChkHorse() && ppoly->getLinkThrough() != 0)) + + if ((polypass->ChkLink() && ppoly->getLinkThrough()) || + (polypass->ChkHorse() && ppoly->getLinkThrough())) { return true; } - if (polypass->ChkArrow() && ppoly->getArrowThrough() != 0) { + + if (polypass->ChkArrow() && ppoly->getArrowThrough()) { return true; } - if (polypass->ChkBomb() && ppoly->getBombThrough() != 0) { + + if (polypass->ChkBomb() && ppoly->getBombThrough()) { return true; } - if (polypass->ChkBoomerang() && ppoly->getBoomerangThrough() != 0) { + + if (polypass->ChkBoomerang() && ppoly->getBoomerangThrough()) { return true; } - if (polypass->ChkRope() && ppoly->getRopeThrough() != 0) { + + if (polypass->ChkRope() && ppoly->getRopeThrough()) { return true; } - if (polypass->ChkUnderwaterRoof() && ppoly->getUnderwaterRoof() != 0) { + + if (polypass->ChkUnderwaterRoof() && ppoly->getUnderwaterRoof()) { return true; } + if (ppoly->getWallCode() == 8 && polypass->ChkNoHorse()) { return true; } + if (ppoly->getWallCode() == 9) { if (polypass->ChkNoHorse()) { return true; } + if (polypass->ChkHorse() && dComIfGp_getHorseActor() != NULL) { if (!dComIfGp_getHorseActor()->checkSpecialWallHit(param_4)) { return true; } } } + if (polypass->ChkStatue() && ppoly->getSpl() == 7) { return true; } - if (polypass->ChkIronBall() && ppoly->getIronBallThrough() != 0) { + + if (polypass->ChkIronBall() && ppoly->getIronBallThrough()) { return true; } } + return false; } -/* ############################################################################################## */ -/* 80452718-8045271C 000D18 0004+00 5/5 0/0 0/0 .sdata2 @4187 */ -SECTION_SDATA2 static u8 lit_4187[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 8045271C-80452720 000D1C 0004+00 1/1 0/0 0/0 .sdata2 @4188 */ -SECTION_SDATA2 static f32 lit_4188 = 500.0f; - -/* 80452720-80452724 000D20 0004+00 6/6 0/0 0/0 .sdata2 @4189 */ -SECTION_SDATA2 static f32 lit_4189 = 1.0f; - -/* 80452724-80452728 000D24 0004+00 4/4 0/0 0/0 .sdata2 @4190 */ -SECTION_SDATA2 static f32 lit_4190 = 0.007499999832361937f; - -/* 80452728-8045272C 000D28 0004+00 4/4 0/0 0/0 .sdata2 @4191 */ -SECTION_SDATA2 static f32 lit_4191 = -0.007499999832361937f; - /* 8007EE34-8007F628 079774 07F4+00 1/0 0/0 0/0 .text LineCheck__8dBgWKColFP11cBgS_LinChk */ -bool dBgWKCol::LineCheck(cBgS_LinChk* param_0) { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 8045272C-80452730 000D2C 0004+00 1/1 0/0 0/0 .sdata2 @4293 */ -SECTION_SDATA2 static f32 lit_4293 = 0.014000000432133675f; - -/* 8007F628-8007F9A4 079F68 037C+00 1/0 0/0 0/0 .text GroundCross__8dBgWKColFP11cBgS_GndChk */ -#ifdef NONMATCHING -bool dBgWKCol::GroundCross(cBgS_GndChk* i_chk) { - cXyz* point_p = (cXyz*)&i_chk->GetPointP(); - cXyz sp20; - - VECSubtract(point_p, &m_pkc_head->m_area_min_pos, &sp20); - - u32 temp_r3 = (u32)sp20.x; - if (temp_r3 < 0) { +// NONMATCHING +bool dBgWKCol::LineCheck(cBgS_LinChk* plinchk) { + cXyz* pstart = plinchk->GetStartP(); + cXyz* pcross = plinchk->GetCrossP(); + f32 var_f31 = JMAFastSqrt(VECSquareDistance(pstart, pcross)); + if (cM3d_IsZero(var_f31)) { return 0; } - if (temp_r3 > ~m_pkc_head->field_0x20) { - return 0; - } + f32 var_f25 = 500.0f / var_f31; + f32 var_f29 = 0.0f; - u32 temp_r3_2 = (u32)sp20.z; - if (temp_r3_2 < 0) { - return 0; - } + cXyz sp144; + VECSubtract(pcross, pstart, &sp144); + VECScale(&sp144, &sp144, var_f25); - if (temp_r3_2 > ~m_pkc_head->field_0x28) { - return 0; - } + cXyz sp138; + cXyz sp12C; + sp12C = *pstart; - u32 var_r25 = (u32)sp20.y; - if (var_r25 < 0) { - return 0; - } + bool spB = false; - if (var_r25 > ~m_pkc_head->field_0x24) { - var_r25 = (u32)~m_pkc_head->field_0x24; - } - - bool var_r24 = 0; - int var_r23 = 0; - cXyz sp14; - while (var_r25 >= var_r23) { - u32 var_r22 = m_pkc_head->field_0x2c; - u32 var_r4 = ((temp_r3 >> var_r22) | (((temp_r3_2 >> var_r22) << m_pkc_head->field_0x34) | ((var_r25 >> var_r22) << m_pkc_head->field_0x30))) * 4; - - KC_PrismData* data_p = &m_pkc_head->m_block_data[var_r4]; - for (; data_p->field_0x0[0] >= 0; data_p++) { - var_r22--; - var_r4 = ((((((var_r25 >> var_r22) * 2) & 2 & ~4) | (((temp_r3_2 >> var_r22) << 2) & 4)) & ~1) | ((temp_r3 >> var_r22) & 1)) * 4; + do { + sp138 = sp12C; + if (var_f29 + 500.0f <= var_f31) { + VECAdd(&sp12C, &sp144, &sp12C); + } else { + sp12C = *pcross; } - u16* var_r21 = data_p->field_0x0; - while (var_r21[0]++ != 0) { - KC_PrismData* temp_r27 = &m_pkc_head->m_prism_data[var_r21[0]]; - Vec* temp_r20 = &m_pkc_head->field_0x4[temp_r27->field_0x6]; + cXyz sp120(sp12C); + cXyz sp114; + cXyz sp108; - if (temp_r20->y >= 0.014000000432133675f && !cM3d_IsZero(temp_r20->y) && (cBgW_CheckBWall(temp_r20->y) || i_chk->GetWallPrecheck())) { - Vec* temp_r19_2 = &m_pkc_head->field_0x0[temp_r27->field_0x4]; - sp14.x = i_chk->m_pos.x - temp_r19_2->x; - sp14.z = i_chk->m_pos.z - temp_r19_2->z; - sp14.y = -(sp14.x * temp_r20->x + sp14.z * temp_r20->z) / temp_r19_2->y; + VECSubtract(&sp138, &m_pkc_head->m_area_min_pos, &sp114); + sp108 = sp114; - if (VECDotProduct(&sp14, &m_pkc_head->field_0x4[temp_r27->field_0x8]) <= 0.0075f && - VECDotProduct(&sp14, &m_pkc_head->field_0x4[temp_r27->field_0xa]) <= 0.0075f && - VECDotProduct(&sp14, &m_pkc_head->field_0x4[temp_r27->field_0xc]) <= 0.0075f) - { - dBgPc sp64; - getPolyCode(var_r21[0], &sp64); - cXyz sp40(*temp_r20); + cXyz spFC; + VECSubtract(&sp12C, &m_pkc_head->m_area_min_pos, &spFC); - if (!chkPolyThrough(&sp64, i_chk->GetPolyPassChk(), i_chk->GetGrpPassChk(), sp40)) { - f32 tmp_height_kcw = sp14.y + temp_r19_2->y; - f32 now_y = i_chk->GetNowY(); + if (sp114.x > spFC.x) { + sp114.x = spFC.x; + } else { + sp108.x = spFC.x; + } - if (now_y < tmp_height_kcw && tmp_height_kcw < i_chk->m_pos.y) { - i_chk->SetPolyIndex(var_r21[0]); - i_chk->SetNowY(tmp_height_kcw); - var_r24 = 1; - var_r23 = (u32)(tmp_height_kcw - m_pkc_head->m_area_min_pos.y); - } - } + if (sp114.y > spFC.y) { + sp114.y = spFC.y; + } else { + sp108.y = spFC.y; + } + if (sp114.z > spFC.z) { + sp114.z = spFC.z; + } else { + sp108.z = spFC.z; + } + + sp114.x -= 1.0f; + sp114.y -= 1.0f; + sp114.z -= 1.0f; + sp108.x += 1.0f; + sp108.y += 1.0f; + sp108.z += 1.0f; + + int sp90 = (u32)sp114.x; + if (sp90 < 0) { + sp90 = 0; + } + + int sp84 = (u32)sp108.x; + if (sp84 > (int)~m_pkc_head->m_area_x_width_mask) { + sp84 = (int)~m_pkc_head->m_area_x_width_mask; + } + + if (sp90 < sp84) { + int sp8C = (u32)sp114.y; + if (sp8C < 0) { + sp8C = 0; + } + + int sp80 = (u32)sp108.y; + if (sp80 > (int)~m_pkc_head->m_area_y_width_mask) { + sp80 = (int)~m_pkc_head->m_area_y_width_mask; + } + + if (sp8C < sp80) { + int sp88 = (u32)sp114.z; + if (sp88 < 0) { + sp88 = 0; + } + + int sp7C = (u32)sp108.z; + if (sp7C > (int)~m_pkc_head->m_area_z_width_mask) { + sp7C = (int)~m_pkc_head->m_area_z_width_mask; + } + + if (sp88 < sp7C) { + cXyz spF0; + u16* sp58 = 0; + u16* sp54 = 0; + u16* sp50 = 0; + u16* sp4C = 0; + u16* sp48 = 0; + u16* sp44 = 0; + int sp40 = sp88; + + do { + int sp68 = 1000000; + int sp3C = sp8C; + + do { + int sp6C = 1000000; + int sp64 = 0; + int sp60 = 0; + int sp5C = 0; + int sp38 = sp90; + + do { + u32 block = (u32)m_pkc_head->m_block_data; + u32 shift = m_pkc_head->m_block_width_shift; + int sp2C = 4 * (((u32)sp3C >> shift) << m_pkc_head->m_area_xy_blocks_shift | + ((u32)sp40 >> shift) << m_pkc_head->m_area_x_blocks_shift | + (u32)sp38 >> shift); + + + while ((sp2C = (*(s32*)(block + sp2C))), sp2C >= 0) { + block += sp2C; + shift--; + + sp2C = 4 * ((4 * ((u32)sp3C >> shift)) & 4 | + (2 * ((u32)sp40 >> shift)) & 2 | + (1 * ((u32)sp38 >> shift)) & 1); + } + + u16* sp28 = (u16*)(block + (sp2C & 0x7FFFFFFF)); + + shift = 1 << shift; + int sp24 = shift - 1; + int sp78 = (sp38 & sp24) - shift; + int sp74 = (sp3C & sp24) - shift; + int sp70 = (sp40 & sp24) - shift; + + if (sp70 < sp68) { + sp68 = sp70; + } + + if (sp74 < sp6C) { + sp6C = sp74; + } + + if (sp28[1] != 0 && sp74 > sp5C) { + if (sp74 > sp60) { + if (sp74 > sp64) { + sp5C = sp60; + sp60 = sp64; + sp64 = sp74; + sp50 = sp54; + sp54 = sp58; + sp58 = sp28; + } else { + sp5C = sp60; + sp60 = sp74; + sp50 = sp54; + sp54 = sp28; + } + } else { + sp5C = sp74; + sp50 = sp28; + } + } + + if (sp28 != sp4C && sp28 != sp48) { + if (sp28 == sp44) { + + } else { + while (sp28[1] != 0) { + KC_PrismData* sp20 = getPrismData(sp28[0]); + Vec* sp1C = &m_pkc_head->m_nrm_data[sp20->fnrm_i]; + Vec* sp18 = &m_pkc_head->m_pos_data[sp20->pos_i]; + + cXyz spE4; + VECSubtract(&sp138, sp18, &spE4); + f32 temp_f30 = VECDotProduct(sp1C, &spE4); + + cXyz spD8; + VECSubtract(&sp120, sp18, &spD8); + f32 temp_f28 = VECDotProduct(sp1C, &spD8); + + if ((temp_f30 >= 0.0f && temp_f30 <= 0.0f && plinchk->ChkFrontFlag()) || + (temp_f30 <= 0.0f && temp_f30 >= 0.0f && plinchk->ChkBackFlag())) + { + f32 temp_f27 = temp_f30 - temp_f28; + if (!cM3d_IsZero(fabsf(temp_f27))) { + Vec spCC, spC0; + VECSubtract(&spD8, &spE4, &spCC); + VECScale(&spCC, &spC0, temp_f30 / temp_f27); + + cXyz spB4; + VECAdd(&spE4, &spC0, &spB4); + + Vec* sp14 = &m_pkc_head->m_nrm_data[sp20->enrm1_i]; + + if (VECDotProduct(&spB4, sp14) <= 0.0075f) { + Vec* sp10 = &m_pkc_head->m_nrm_data[sp20->enrm2_i]; + if (VECDotProduct(&spB4, sp10) <= 0.0075f) { + Vec* spC = &m_pkc_head->m_nrm_data[sp20->enrm3_i]; + f32 var_f26 = VECDotProduct(&spB4, spC); + if (var_f26 >= -0.0075f && var_f26 <= sp20->height + 0.0075f) { + if ((cBgW_CheckBGround(sp1C->x) && plinchk->GetPreGroundChk()) || + (cBgW_CheckBRoof(sp1C->x) && plinchk->GetPreRoofChk()) || + plinchk->GetPreWallChk()) + { + dBgPc sp150; + getPolyCode(sp28[0], &sp150); + + cXyz spA8(*sp1C); + if (!chkPolyThrough(&sp150, plinchk->GetPolyPassChk(), plinchk->GetGrpPassChk(), spA8)) { + cXyz sp9C; + VECAdd(&spB4, sp18, &sp9C); + spB = 1; + *pcross = sp9C; + sp120 = sp9C; + plinchk->SetPolyIndex(sp28[0]); + } + } + + } + } + } + + } + } + } + } + } + + sp38 += sp78; + } while ((u32)sp38 <= sp84); + + sp4C = sp58; + sp48 = sp54; + sp44 = sp50; + sp3C += sp6C; + } while ((u32)sp3C <= sp80); + + sp40 += sp68; + } while ((u32)sp40 <= sp7C); + + if (spB) + break; } } } - var_r25 = (var_r25 & ~((1 << var_r22) - 1)) - 1; + + var_f29 += 500.0f; + } while (var_f29 <= var_f31); + + return spB; +} + +/* 8007F628-8007F9A4 079F68 037C+00 1/0 0/0 0/0 .text GroundCross__8dBgWKColFP11cBgS_GndChk */ +// NONMATCHING +bool dBgWKCol::GroundCross(cBgS_GndChk* i_chk) { + KC_PrismData* sp18; + cXyz* point_p = (cXyz*)&i_chk->GetPointP(); + cXyz sp58; + + + VECSubtract(point_p, &m_pkc_head->m_area_min_pos, &sp58); + + int sp38 = (u32)sp58.x; + if (sp38 < 0) { + return 0; + } else if (sp38 > (int)~m_pkc_head->m_area_x_width_mask) { + return 0; } + int sp34 = (u32)sp58.z; + if (sp34 < 0) { + return 0; + } else if (sp34 > (int)~m_pkc_head->m_area_z_width_mask) { + return 0; + } + + int sp30 = (u32)sp58.y; + if (sp30 < 0) { + return 0; + } else if (sp30 > (int)~m_pkc_head->m_area_y_width_mask) { + sp30 = (int)~m_pkc_head->m_area_y_width_mask; + } + + bool var_r24 = 0; + + cXyz sp4C; + int sp2C = 0; + do { + u32 block = (u32)m_pkc_head->m_block_data; + u32 shift = m_pkc_head->m_block_width_shift; + int sp20 = 4 * (((u32)sp34 >> shift) << m_pkc_head->m_area_xy_blocks_shift | + ((u32)sp30 >> shift) << m_pkc_head->m_area_x_blocks_shift | + (u32)sp38 >> shift); + while ((sp20 = (*(s32*)(block + sp20))), sp20 >= 0) { + block += sp20; + shift--; + sp20 = 4 * ((4 * ((u32)sp34 >> shift)) & 4 | + (2 * ((u32)sp30 >> shift)) & 2 | + (1 * ((u32)sp38 >> shift)) & 1); + } + + u16* sp1C = (u16*)(block + (sp20 & 0x7FFFFFFF)); + + while (*++sp1C != 0) { + sp18 = &m_pkc_head->m_prism_data[sp1C[0]]; + Vec* sp14 = &m_pkc_head->m_nrm_data[sp18->fnrm_i]; + + if (!(sp14->y < 0.014f) && !cM3d_IsZero(sp14->y) && (!cBgW_CheckBWall(sp14->y) || i_chk->GetWallPrecheck())) { + Vec* sp10 = &m_pkc_head->m_pos_data[sp18->pos_i]; + sp4C.x = point_p->x - sp10->x; + sp4C.z = point_p->z - sp10->z; + sp4C.y = -(sp4C.x * sp14->x + sp4C.z * sp14->z) / sp14->y; + + if (!(VECDotProduct(&sp4C, &m_pkc_head->m_nrm_data[sp18->enrm1_i]) > 0.0075f) && + !(VECDotProduct(&sp4C, &m_pkc_head->m_nrm_data[sp18->enrm2_i]) > 0.0075f)) + { + f32 var_f30 = VECDotProduct(&sp4C, &m_pkc_head->m_nrm_data[sp18->enrm3_i]); + if (!(var_f30 > 0.0075f + sp18->height) && !(var_f30 < -0.0075f)) { + dBgPc sp64; + getPolyCode(sp1C[0], &sp64); + cXyz sp40(*sp14); + + if (!chkPolyThrough(&sp64, i_chk->GetPolyPassChk(), i_chk->GetGrpPassChk(), sp40)) { + f32 tmp_height_kcw = sp4C.y + sp10->y; + f32 now_y = i_chk->GetNowY(); + + if (now_y < tmp_height_kcw && point_p->y > tmp_height_kcw) { + i_chk->SetPolyIndex(sp1C[0]); + i_chk->SetNowY(tmp_height_kcw); + var_r24 = 1; + sp2C = (u32)(tmp_height_kcw - m_pkc_head->m_area_min_pos.y); + } + } + } + } + } + } + + sp30 &= ~((1 << shift) - 1); + sp30--; + } while (sp30 >= sp2C); + return var_r24; } -#else -bool dBgWKCol::GroundCross(cBgS_GndChk* param_0) { - // NONMATCHING -} -#endif /* 8007F9A4-8007FF00 07A2E4 055C+00 1/0 0/0 0/0 .text ShdwDraw__8dBgWKColFP13cBgS_ShdwDraw */ void dBgWKCol::ShdwDraw(cBgS_ShdwDraw* param_0) { @@ -478,26 +609,164 @@ void dBgWKCol::ShdwDraw(cBgS_ShdwDraw* param_0) { } /* 8007FF00-8007FF1C 07A840 001C+00 1/1 0/0 0/0 .text ChkShdwDrawThrough__8dBgWKColFP5dBgPc */ -bool dBgWKCol::ChkShdwDrawThrough(dBgPc* pbgpc) { - if (pbgpc->getShdwThrough()) { +bool dBgWKCol::ChkShdwDrawThrough(dBgPc* pcode) { + if (pcode->getShdwThrough()) { return true; } - return pbgpc->getArrowThrough(); + return pcode->getArrowThrough(); } -/* ############################################################################################## */ -/* 80424F70-80424F94 051C90 0024+00 1/1 0/0 0/0 .bss vtx_tbl$4582 */ -static Vec vtx_tbl_4582[3]; - /* 8007FF1C-80080330 07A85C 0414+00 1/0 0/0 0/0 .text CaptPoly__8dBgWKColFR13dBgS_CaptPoly */ -void dBgWKCol::CaptPoly(dBgS_CaptPoly& param_0) { - // NONMATCHING +// NONMATCHING +void dBgWKCol::CaptPoly(dBgS_CaptPoly& i_captpoly) { + cM3dGAab* pbounds = i_captpoly.GetBndP(); + cXyz min(*pbounds->GetMinP()); + cXyz max(*pbounds->GetMaxP()); + + min.x -= 1.0f; + min.y -= 1.0f; + min.z -= 1.0f; + max.x += 1.0f; + max.y += 1.0f; + max.z += 1.0f; + + Vec* area_min = &m_pkc_head->m_area_min_pos; + + int sp5C = (u32)(min.x - area_min->x); + if (sp5C < 0) { + sp5C = 0; + } + + int sp58 = (u32)(max.x - area_min->x); + if (sp5C > (int)~m_pkc_head->m_area_x_width_mask) { + sp5C = (int)~m_pkc_head->m_area_x_width_mask; + } + + if (sp5C < sp58) { + int sp54 = (u32)(min.y - area_min->y); + if (sp54 < 0) { + sp54 = 0; + } + + int sp50 = (u32)(max.y - area_min->y); + if (sp50 > (int)~m_pkc_head->m_area_y_width_mask) { + sp50 = (int)~m_pkc_head->m_area_y_width_mask; + } + + if (sp54 < sp50) { + int sp4C = (u32)(min.z - area_min->z); + if (sp4C < 0) { + sp4C = 0; + } + + int sp48 = (u32)(max.z - area_min->z); + if (sp48 > (int)~m_pkc_head->m_area_z_width_mask) { + sp48 = (int)~m_pkc_head->m_area_z_width_mask; + } + + if (sp4C < sp48) { + u16* sp2C = 0; + u16* sp28 = 0; + int sp24 = sp4C; + + do { + int sp34 = 1000000; + int sp20 = sp4C; + + do { + int sp38 = 1000000; + int sp30 = 0; + int sp1C = sp5C; + + do { + u32 block = (u32)m_pkc_head->m_block_data; + u32 shift = m_pkc_head->m_block_width_shift; + int sp14 = 4 * (((u32)sp24 >> shift) << m_pkc_head->m_area_xy_blocks_shift | + ((u32)sp20 >> shift) << m_pkc_head->m_area_x_blocks_shift | + (u32)sp1C >> shift); + + + while ((sp14 = (*(s32*)(block + sp14))), sp14 >= 0) { + block += sp14; + shift--; + + sp14 = 4 * ((4 * ((u32)sp24 >> shift)) & 4 | + (2 * ((u32)sp20 >> shift)) & 2 | + (1 * ((u32)sp1C >> shift)) & 1); + } + + u16* var_r28 = (u16*)(block + (sp14 & 0x7FFFFFFF)); + + shift = 1 << shift; + int sp10 = shift - 1; + int sp44 = (sp1C & sp10) - shift; + int sp40 = (sp20 & sp10) - shift; + int sp3C = (sp24 & sp10) - shift; + + if (sp3C < sp34) { + sp34 = sp3C; + } + + if (sp40 < sp38) { + sp38 = sp40; + } + + if (sp40 > sp30 && var_r28[1] != 0) { + sp30 = sp40; + sp2C = var_r28; + } + + if (var_r28 != sp28) { + while (var_r28[1] != 0) { + KC_PrismData* spC = getPrismData(var_r28[0]); + Vec* sp8 = &m_pkc_head->m_nrm_data[spC->fnrm_i]; + + dBgPc spD8; + getPolyCode(var_r28[0], &spD8); + + cXyz sp8C(*sp8); + if (!chkPolyThrough(&spD8, i_captpoly.GetPolyPassChk(), i_captpoly.GetGrpPassChk(), sp8C)) { + cXyz sp80; + cXyz sp74; + cXyz sp68; + if (GetTriPnt(var_r28[0], &sp80, &sp74, &sp68)) { + static Vec vtx_tbl[3]; + vtx_tbl[0] = sp80; + vtx_tbl[1] = sp74; + vtx_tbl[2] = sp68; + + cM3dGPla plane; + plane = GetTriPla(var_r28[0]); + + i_captpoly.m_callback(i_captpoly, (cBgD_Vtx_t*)&vtx_tbl, 0, 1, 2, &plane); + } + } + } + } + + sp1C += sp44; + } while ((u32)sp1C <= sp58); + + sp28 = sp2C; + sp20 += sp38; + } while ((u32)sp20 <= sp50); + + sp24 += sp34; + } while ((u32)sp24 <= sp48); + } + } + } } -/* ############################################################################################## */ /* 80424F94-80425384 051CB4 03F0+00 1/1 0/0 0/0 .bss l_wcsbuf */ -static u8 l_wcsbuf[1008]; +struct wcs_data { + /* 0x0 */ f32 _0; + /* 0x4 */ u16 _4; + /* 0x8 */ int _8; +}; + +static wcs_data l_wcsbuf[84]; /* 80452730-80452738 000D30 0008+00 2/2 0/0 0/0 .sdata2 @5298 */ SECTION_SDATA2 static f64 lit_5298 = 0.5; @@ -539,25 +808,22 @@ bool dBgWKCol::SplGrpChk(dBgS_SplGrpChk* param_0) { // NONMATCHING } -/* ############################################################################################## */ -/* 80425384-804253A8 0520A4 0024+00 1/1 0/0 0/0 .bss vtx_tbl$5950 */ -static Vec vtx_tbl_5950[3]; - /* 800824EC-800829AC 07CE2C 04C0+00 1/0 0/0 0/0 .text SphChk__8dBgWKColFP11dBgS_SphChkPv */ bool dBgWKCol::SphChk(dBgS_SphChk* param_0, void* param_1) { // NONMATCHING + static Vec vtx_tbl[3]; } /* 800829AC-800829F0 07D2EC 0044+00 1/0 0/0 0/0 .text GetTopUnder__8dBgWKColCFPfPf */ void dBgWKCol::GetTopUnder(f32* param_0, f32* param_1) const { *param_1 = m_pkc_head->m_area_min_pos.y; - *param_0 = *param_1 + (f32)~m_pkc_head->field_0x24; + *param_0 = *param_1 + (f32)~m_pkc_head->m_area_y_width_mask; } /* 800829F0-80082A20 07D330 0030+00 1/0 0/0 0/0 .text * GetGrpRoomIndex__8dBgWKColCFRC13cBgS_PolyInfo */ -s32 dBgWKCol::GetGrpRoomIndex(cBgS_PolyInfo const& poly) const { +s32 dBgWKCol::GetGrpRoomIndex(const cBgS_PolyInfo& poly) const { u16 poly_index = poly.GetPolyIndex(); dBgPc bgpc; @@ -566,7 +832,7 @@ s32 dBgWKCol::GetGrpRoomIndex(cBgS_PolyInfo const& poly) const { } /* 80082A20-80082A50 07D360 0030+00 1/0 0/0 0/0 .text GetExitId__8dBgWKColFRC13cBgS_PolyInfo */ -s32 dBgWKCol::GetExitId(cBgS_PolyInfo const& poly) { +s32 dBgWKCol::GetExitId(const cBgS_PolyInfo& poly) { u16 poly_index = poly.GetPolyIndex(); dBgPc bgpc; @@ -575,7 +841,7 @@ s32 dBgWKCol::GetExitId(cBgS_PolyInfo const& poly) { } /* 80082A50-80082A80 07D390 0030+00 1/0 0/0 0/0 .text GetPolyColor__8dBgWKColFRC13cBgS_PolyInfo */ -s32 dBgWKCol::GetPolyColor(cBgS_PolyInfo const& poly) { +s32 dBgWKCol::GetPolyColor(const cBgS_PolyInfo& poly) { u16 poly_index = poly.GetPolyIndex(); dBgPc bgpc; @@ -585,7 +851,7 @@ s32 dBgWKCol::GetPolyColor(cBgS_PolyInfo const& poly) { /* 80082A80-80082AB0 07D3C0 0030+00 1/0 0/0 0/0 .text GetHorseNoEntry__8dBgWKColFRC13cBgS_PolyInfo */ -BOOL dBgWKCol::GetHorseNoEntry(cBgS_PolyInfo const& poly) { +BOOL dBgWKCol::GetHorseNoEntry(const cBgS_PolyInfo& poly) { u16 poly_index = poly.GetPolyIndex(); dBgPc bgpc; @@ -595,7 +861,7 @@ BOOL dBgWKCol::GetHorseNoEntry(cBgS_PolyInfo const& poly) { /* 80082AB0-80082AE0 07D3F0 0030+00 1/0 0/0 0/0 .text GetSpecialCode__8dBgWKColFRC13cBgS_PolyInfo */ -int dBgWKCol::GetSpecialCode(cBgS_PolyInfo const& poly) { +int dBgWKCol::GetSpecialCode(const cBgS_PolyInfo& poly) { u16 poly_index = poly.GetPolyIndex(); return GetSpecialCode(poly_index); } @@ -610,7 +876,7 @@ int dBgWKCol::GetSpecialCode(int poly_index) { /* 80082B0C-80082B3C 07D44C 0030+00 1/0 0/0 0/0 .text GetMagnetCode__8dBgWKColFRC13cBgS_PolyInfo */ -int dBgWKCol::GetMagnetCode(cBgS_PolyInfo const& poly) { +int dBgWKCol::GetMagnetCode(const cBgS_PolyInfo& poly) { u16 poly_index = poly.GetPolyIndex(); dBgPc bgpc; @@ -620,7 +886,7 @@ int dBgWKCol::GetMagnetCode(cBgS_PolyInfo const& poly) { /* 80082B3C-80082B6C 07D47C 0030+00 1/0 0/0 0/0 .text * GetMonkeyBarsCode__8dBgWKColFRC13cBgS_PolyInfo */ -int dBgWKCol::GetMonkeyBarsCode(cBgS_PolyInfo const& poly) { +int dBgWKCol::GetMonkeyBarsCode(const cBgS_PolyInfo& poly) { u16 poly_index = poly.GetPolyIndex(); dBgPc bgpc; @@ -710,7 +976,7 @@ bool dBgWKCol::GetShdwThrough(int poly_index) { } /* 80082D24-80082D54 07D664 0030+00 1/0 0/0 0/0 .text GetLinkNo__8dBgWKColFRC13cBgS_PolyInfo */ -int dBgWKCol::GetLinkNo(cBgS_PolyInfo const& poly) { +int dBgWKCol::GetLinkNo(const cBgS_PolyInfo& poly) { u16 poly_index = poly.GetPolyIndex(); dBgPc bgpc; @@ -719,7 +985,7 @@ int dBgWKCol::GetLinkNo(cBgS_PolyInfo const& poly) { } /* 80082D54-80082D84 07D694 0030+00 1/0 0/0 0/0 .text GetWallCode__8dBgWKColFRC13cBgS_PolyInfo */ -s32 dBgWKCol::GetWallCode(cBgS_PolyInfo const& poly) { +s32 dBgWKCol::GetWallCode(const cBgS_PolyInfo& poly) { u16 poly_index = poly.GetPolyIndex(); dBgPc bgpc; @@ -728,7 +994,7 @@ s32 dBgWKCol::GetWallCode(cBgS_PolyInfo const& poly) { } /* 80082D84-80082DB4 07D6C4 0030+00 1/0 0/0 0/0 .text GetPolyAtt0__8dBgWKColFRC13cBgS_PolyInfo */ -int dBgWKCol::GetPolyAtt0(cBgS_PolyInfo const& poly) { +int dBgWKCol::GetPolyAtt0(const cBgS_PolyInfo& poly) { u16 poly_index = poly.GetPolyIndex(); dBgPc bgpc; @@ -737,7 +1003,7 @@ int dBgWKCol::GetPolyAtt0(cBgS_PolyInfo const& poly) { } /* 80082DB4-80082DE4 07D6F4 0030+00 1/0 0/0 0/0 .text GetPolyAtt1__8dBgWKColFRC13cBgS_PolyInfo */ -int dBgWKCol::GetPolyAtt1(cBgS_PolyInfo const& poly) { +int dBgWKCol::GetPolyAtt1(const cBgS_PolyInfo& poly) { u16 poly_index = poly.GetPolyIndex(); dBgPc bgpc; @@ -747,7 +1013,7 @@ int dBgWKCol::GetPolyAtt1(cBgS_PolyInfo const& poly) { /* 80082DE4-80082E14 07D724 0030+00 1/0 0/0 0/0 .text GetGroundCode__8dBgWKColFRC13cBgS_PolyInfo */ -int dBgWKCol::GetGroundCode(cBgS_PolyInfo const& poly) { +int dBgWKCol::GetGroundCode(const cBgS_PolyInfo& poly) { u16 poly_index = poly.GetPolyIndex(); dBgPc bgpc; @@ -772,7 +1038,7 @@ u32 dBgWKCol::GetAttackThrough(int poly_index) { } /* 80082E6C-80082E9C 07D7AC 0030+00 1/0 0/0 0/0 .text GetCamMoveBG__8dBgWKColFRC13cBgS_PolyInfo */ -s32 dBgWKCol::GetCamMoveBG(cBgS_PolyInfo const& poly) { +s32 dBgWKCol::GetCamMoveBG(const cBgS_PolyInfo& poly) { u16 poly_index = poly.GetPolyIndex(); dBgPc bgpc; @@ -781,7 +1047,7 @@ s32 dBgWKCol::GetCamMoveBG(cBgS_PolyInfo const& poly) { } /* 80082E9C-80082ECC 07D7DC 0030+00 1/0 0/0 0/0 .text GetRoomCamId__8dBgWKColFRC13cBgS_PolyInfo */ -s32 dBgWKCol::GetRoomCamId(cBgS_PolyInfo const& poly) { +s32 dBgWKCol::GetRoomCamId(const cBgS_PolyInfo& poly) { u16 poly_index = poly.GetPolyIndex(); dBgPc bgpc; @@ -791,7 +1057,7 @@ s32 dBgWKCol::GetRoomCamId(cBgS_PolyInfo const& poly) { /* 80082ECC-80082EFC 07D80C 0030+00 1/0 0/0 0/0 .text GetRoomPathId__8dBgWKColFRC13cBgS_PolyInfo */ -s32 dBgWKCol::GetRoomPathId(cBgS_PolyInfo const& poly) { +s32 dBgWKCol::GetRoomPathId(const cBgS_PolyInfo& poly) { u16 poly_index = poly.GetPolyIndex(); dBgPc bgpc; @@ -801,7 +1067,7 @@ s32 dBgWKCol::GetRoomPathId(cBgS_PolyInfo const& poly) { /* 80082EFC-80082F2C 07D83C 0030+00 1/0 0/0 0/0 .text * GetRoomPathPntNo__8dBgWKColFRC13cBgS_PolyInfo */ -s32 dBgWKCol::GetRoomPathPntNo(cBgS_PolyInfo const& poly) { +s32 dBgWKCol::GetRoomPathPntNo(const cBgS_PolyInfo& poly) { u16 poly_index = poly.GetPolyIndex(); dBgPc bgpc; @@ -811,7 +1077,7 @@ s32 dBgWKCol::GetRoomPathPntNo(cBgS_PolyInfo const& poly) { /* 80082F2C-80082F5C 07D86C 0030+00 1/0 0/0 0/0 .text * GetPolyGrpRoomInfId__8dBgWKColFRC13cBgS_PolyInfo */ -u8 dBgWKCol::GetPolyGrpRoomInfId(cBgS_PolyInfo const& poly) { +u8 dBgWKCol::GetPolyGrpRoomInfId(const cBgS_PolyInfo& poly) { u16 poly_index = poly.GetPolyIndex(); dBgPc bgpc; @@ -821,7 +1087,7 @@ u8 dBgWKCol::GetPolyGrpRoomInfId(cBgS_PolyInfo const& poly) { /* 80082F5C-80082F8C 07D89C 0030+00 1/0 0/0 0/0 .text GetGrpSoundId__8dBgWKColFRC13cBgS_PolyInfo */ -int dBgWKCol::GetGrpSoundId(cBgS_PolyInfo const& poly) { +int dBgWKCol::GetGrpSoundId(const cBgS_PolyInfo& poly) { u16 poly_index = poly.GetPolyIndex(); dBgPc bgpc; @@ -831,15 +1097,15 @@ int dBgWKCol::GetGrpSoundId(cBgS_PolyInfo const& poly) { /* 80082F8C-80082F90 07D8CC 0004+00 1/0 0/0 0/0 .text * CrrPos__8dBgWKColFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz */ -void dBgWKCol::CrrPos(cBgS_PolyInfo const& param_0, void* param_1, bool param_2, cXyz* param_3, +void dBgWKCol::CrrPos(const cBgS_PolyInfo& param_0, void* param_1, bool param_2, cXyz* param_3, csXyz* param_4, csXyz* param_5) {} /* 80082F90-80082F94 07D8D0 0004+00 1/0 0/0 0/0 .text * TransPos__8dBgWKColFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz */ -void dBgWKCol::TransPos(cBgS_PolyInfo const& param_0, void* param_1, bool param_2, cXyz* param_3, +void dBgWKCol::TransPos(const cBgS_PolyInfo& param_0, void* param_1, bool param_2, cXyz* param_3, csXyz* param_4, csXyz* param_5) {} /* 80082F94-80082F98 07D8D4 0004+00 1/0 0/0 0/0 .text * MatrixCrrPos__8dBgWKColFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz */ -void dBgWKCol::MatrixCrrPos(cBgS_PolyInfo const& param_0, void* param_1, bool param_2, +void dBgWKCol::MatrixCrrPos(const cBgS_PolyInfo& param_0, void* param_1, bool param_2, cXyz* param_3, csXyz* param_4, csXyz* param_5) {} diff --git a/src/d/d_cam_param.cpp b/src/d/d_cam_param.cpp index a04cef1c93..acd18cf844 100644 --- a/src/d/d_cam_param.cpp +++ b/src/d/d_cam_param.cpp @@ -144,6 +144,9 @@ dCamParam_c::dCamParam_c(s32 i_styleID) { mMapToolArg2 = -1; } +/* 8008858C-800885D4 082ECC 0048+00 1/0 1/1 0/0 .text __dt__11dCamParam_cFv */ +dCamParam_c::~dCamParam_c() {} + /* 800885D4-80088620 082F14 004C+00 1/1 7/7 0/0 .text Change__11dCamParam_cFl */ int dCamParam_c::Change(s32 i_styleID) { if (i_styleID >= 0 && i_styleID < mStyleNum) { @@ -256,6 +259,9 @@ dCamSetup_c::dCamSetup_c() { dCam_getBody()->EventRecoverNotime(); } +/* 800888B8-80088918 0831F8 0060+00 1/0 1/1 0/0 .text __dt__11dCamSetup_cFv */ +dCamSetup_c::~dCamSetup_c() {} + /* 80088918-80088988 083258 0070+00 0/0 1/1 0/0 .text CheckLatitudeRange__11dCamSetup_cFPs */ bool dCamSetup_c::CheckLatitudeRange(s16* param_0) { s16 temp0 = cAngle::d2s(field_0x60); diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 2a459b4599..1b278cfaa4 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -718,441 +718,7 @@ SECTION_DATA static u8 Dsp[20] = { 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, }; -/* 803BA4B8-803BA4C4 -00001 000C+00 0/1 0/0 0/0 .data @16620 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16620[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)pauseEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA4C4-803BA4D0 -00001 000C+00 0/1 0/0 0/0 .data @16621 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16621[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)pauseEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA4D0-803BA4DC -00001 000C+00 0/1 0/0 0/0 .data @16622 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16622[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)talktoEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA4DC-803BA4E8 -00001 000C+00 0/1 0/0 0/0 .data @16623 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16623[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)fixedPositionEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA4E8-803BA4F4 -00001 000C+00 0/1 0/0 0/0 .data @16624 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16624[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)fixedFrameEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA4F4-803BA500 -00001 000C+00 0/1 0/0 0/0 .data @16625 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16625[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)uniformTransEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA500-803BA50C -00001 000C+00 0/1 0/0 0/0 .data @16626 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16626[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)watchActorEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA50C-803BA518 -00001 000C+00 0/1 0/0 0/0 .data @16627 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16627[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)restorePosEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA518-803BA524 -00001 000C+00 0/1 0/0 0/0 .data @16628 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16628[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)getItemEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA524-803BA530 -00001 000C+00 0/1 0/0 0/0 .data @16629 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16629[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)gameOverEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA530-803BA53C -00001 000C+00 0/1 0/0 0/0 .data @16630 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16630[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)turnToActorEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA53C-803BA548 -00001 000C+00 0/1 0/0 0/0 .data @16631 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16631[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)rollingEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA548-803BA554 -00001 000C+00 0/1 0/0 0/0 .data @16632 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16632[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)tactEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA554-803BA560 -00001 000C+00 0/1 0/0 0/0 .data @16633 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16633[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)pauseEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA560-803BA56C -00001 000C+00 0/1 0/0 0/0 .data @16634 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16634[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)portalWarpEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA56C-803BA578 -00001 000C+00 0/1 0/0 0/0 .data @16635 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16635[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)styleEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA578-803BA584 -00001 000C+00 0/1 0/0 0/0 .data @16636 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16636[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)saveEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA584-803BA590 -00001 000C+00 0/1 0/0 0/0 .data @16637 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16637[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)loadEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA590-803BA59C -00001 000C+00 0/1 0/0 0/0 .data @16638 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16638[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)useItem0EvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA59C-803BA5A8 -00001 000C+00 0/1 0/0 0/0 .data @16639 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16639[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)useItem1EvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA5A8-803BA5B4 -00001 000C+00 0/1 0/0 0/0 .data @16640 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16640[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)fixedFramesEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA5B4-803BA5C0 -00001 000C+00 0/1 0/0 0/0 .data @16641 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16641[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)bSplineEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA5C0-803BA5CC -00001 000C+00 0/1 0/0 0/0 .data @16642 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16642[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)possessedEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA5CC-803BA5D8 -00001 000C+00 0/1 0/0 0/0 .data @16643 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16643[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)twoActor0EvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA5D8-803BA5E4 -00001 000C+00 0/1 0/0 0/0 .data @16644 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16644[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)stokerEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA5E4-803BA5F0 -00001 000C+00 0/1 0/0 0/0 .data @16645 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16645[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)uniformBrakeEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA5F0-803BA5FC -00001 000C+00 0/1 0/0 0/0 .data @16646 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16646[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)uniformAcceleEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA5FC-803BA608 -00001 000C+00 0/1 0/0 0/0 .data @16647 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16647[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)stbWaitEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA608-803BA614 -00001 000C+00 0/1 0/0 0/0 .data @16648 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16648[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)currentEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA614-803BA620 -00001 000C+00 0/1 0/0 0/0 .data @16649 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16649[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)peepHoleEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA620-803BA62C -00001 000C+00 0/1 0/0 0/0 .data @16650 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16650[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)digHoleEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA62C-803BA638 -00001 000C+00 0/1 0/0 0/0 .data @16651 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16651[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)hintTalkEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA638-803BA644 -00001 000C+00 0/1 0/0 0/0 .data @16652 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16652[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)bspTransEvCamera__9dCamera_cFv, -}; -#pragma pop - -/* 803BA644-803BA650 -00001 000C+00 0/1 0/0 0/0 .data @16653 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_16653[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)maptoolIdEvCamera__9dCamera_cFv, -}; -#pragma pop - /* 803BA650-803BA6D8 -00001 0088+00 0/1 0/0 0/0 .data ActionNames$16655 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* ActionNames[34] = { - (void*)(((char*)&d_d_camera__stringBase0) + 0x21C), - (void*)(((char*)&d_d_camera__stringBase0) + 0x222), - (void*)(((char*)&d_d_camera__stringBase0) + 0x227), - (void*)(((char*)&d_d_camera__stringBase0) + 0x22C), - (void*)(((char*)&d_d_camera__stringBase0) + 0x235), - (void*)(((char*)&d_d_camera__stringBase0) + 0x23E), - (void*)(((char*)&d_d_camera__stringBase0) + 0x247), - (void*)(((char*)&d_d_camera__stringBase0) + 0x252), - (void*)(((char*)&d_d_camera__stringBase0) + 0x25D), - (void*)(((char*)&d_d_camera__stringBase0) + 0x265), - (void*)(((char*)&d_d_camera__stringBase0) + 0x26E), - (void*)(((char*)&d_d_camera__stringBase0) + 0x27A), - (void*)(((char*)&d_d_camera__stringBase0) + 0x282), - (void*)(((char*)&d_d_camera__stringBase0) + 0x287), - (void*)(((char*)&d_d_camera__stringBase0) + 0x28F), - (void*)(((char*)&d_d_camera__stringBase0) + 0x29A), - (void*)(((char*)&d_d_camera__stringBase0) + 0x2A0), - (void*)(((char*)&d_d_camera__stringBase0) + 0x2A5), - (void*)(((char*)&d_d_camera__stringBase0) + 0x2AA), - (void*)(((char*)&d_d_camera__stringBase0) + 0x2B3), - (void*)(((char*)&d_d_camera__stringBase0) + 0x2BC), - (void*)(((char*)&d_d_camera__stringBase0) + 0x2C6), - (void*)(((char*)&d_d_camera__stringBase0) + 0x2CE), - (void*)(((char*)&d_d_camera__stringBase0) + 0x2D8), - (void*)(((char*)&d_d_camera__stringBase0) + 0x2E2), - (void*)(((char*)&d_d_camera__stringBase0) + 0x2E9), - (void*)(((char*)&d_d_camera__stringBase0) + 0x2F2), - (void*)(((char*)&d_d_camera__stringBase0) + 0x2FC), - (void*)(((char*)&d_d_camera__stringBase0) + 0x304), - (void*)(((char*)&d_d_camera__stringBase0) + 0x30C), - (void*)(((char*)&d_d_camera__stringBase0) + 0x315), - (void*)(((char*)&d_d_camera__stringBase0) + 0x31D), - (void*)(((char*)&d_d_camera__stringBase0) + 0x326), - (void*)(((char*)&d_d_camera__stringBase0) + 0x32F), -}; -#pragma pop - -/* 803BA6D8-803BA6E4 -00001 000C+00 1/1 0/0 0/0 .data l_method$17952 */ -SECTION_DATA static request_of_phase_process_fn l_method[3] = { - (request_of_phase_process_fn)init_phase1__FP12camera_class, - (request_of_phase_process_fn)init_phase2__FP12camera_class, - (request_of_phase_process_fn)NULL, -}; - -/* 803BA6E4-803BA6F8 -00001 0014+00 2/0 0/0 0/0 .data method */ -SECTION_DATA static void* method[5] = { - (void*)camera_create__FP12camera_class, (void*)camera_delete__FP20camera_process_class, - (void*)camera_execute__FP20camera_process_class, (void*)is_camera_delete__FPv, - (void*)camera_draw__FP20camera_process_class, -}; - -/* 803BA6F8-803BA73C -00001 0044+00 0/0 0/0 1/0 .data g_profile_CAMERA */ -SECTION_DATA extern void* g_profile_CAMERA[17] = { - (void*)0xFFFFFFFD, (void*)0x000BFFFD, - (void*)0x030D0000, (void*)&g_fpcLf_Method, - (void*)0x00000D58, (void*)NULL, - (void*)NULL, (void*)&g_fopVw_Method, - (void*)NULL, (void*)&g_fopCam_Method, - (void*)NULL, (void*)NULL, - (void*)NULL, (void*)NULL, - (void*)NULL, (void*)&method, - (void*)NULL, -}; - -/* 803BA73C-803BA798 -00001 0044+18 0/0 0/0 1/0 .data g_profile_CAMERA2 */ -SECTION_DATA extern void* g_profile_CAMERA2[17 + 6 /* padding */] = { - (void*)0xFFFFFFFD, - (void*)0x000BFFFD, - (void*)0x030E0000, - (void*)&g_fpcLf_Method, - (void*)0x00000D58, - (void*)NULL, - (void*)NULL, - (void*)&g_fopVw_Method, - (void*)0x00010000, - (void*)&g_fopCam_Method, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)&method, - (void*)NULL, - /* padding */ - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, -}; namespace { inline static int get_camera_id(camera_class* i_camera) { @@ -2110,7 +1676,7 @@ bool dCamera_c::Run() { // fakematch: field_0x28.mRadius should be field_0x28.R() if (field_0x28.mRadius < mCamSetup.PlayerHideDist()) { - if (chkFlag(0x800)) { + if (chkFlag(0x800) & 1) { setComStat(2); } else if (chkFlag(0x10000000)) { setComStat(0x20); @@ -2291,6 +1857,7 @@ void dCamera_c::setStageMapToolData() { } } } + /* 80163340-80163558 15DC80 0218+00 2/2 0/0 0/0 .text setMapToolData__9dCamera_cFv */ void dCamera_c::setMapToolData() { int room_no = dComIfGp_roomControl_getStayNo(); @@ -2456,7 +2023,6 @@ s32 dCamera_c::nextMode(s32 i_curMode) { } /* 80163C38-80163D50 15E578 0118+00 2/1 0/0 0/0 .text onModeChange__9dCamera_cFll */ -// NONMATCHING second switch needs to use a jump table bool dCamera_c::onModeChange(s32 i_curMode, s32 i_nextMode) { field_0x160 = 0; field_0x164 = 0; @@ -2496,12 +2062,6 @@ bool dCamera_c::onModeChange(s32 i_curMode, s32 i_nextMode) { field_0x940 = 0; } break; - case 3: - case 4: - case 5: - case 6: - case 8: - case 9: case 10: break; } @@ -3364,7 +2924,6 @@ cSAngle dCamera_c::forwardCheckAngle() { return ret; } -/* ############################################################################################## */ /* 80451024-80451028 000524 0004+00 1/1 0/0 0/0 .sbss prev_plat1$8536 */ static u8 prev_plat1[4]; @@ -3434,16 +2993,28 @@ cCcD_ShapeAttr::Shape::~Shape() { /* 80167BF8-80167C24 162538 002C+00 2/2 0/0 0/0 .text * lineBGCheckBoth__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl */ -void dCamera_c::lineBGCheckBoth(cXyz* param_0, cXyz* param_1, dBgS_LinChk* param_2, - u32 param_3) { - // NONMATCHING +bool dCamera_c::lineBGCheckBoth(cXyz* i_start, cXyz* i_end, dBgS_LinChk* i_linchk, + u32 i_flags) { + i_linchk->onBackFlag(); + i_linchk->onFrontFlag(); + return lineBGCheck(i_start, i_end, i_linchk, i_flags); } /* 80167C24-80167CB8 162564 0094+00 1/1 0/0 0/0 .text * radiusActorInSight__9dCamera_cFP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c */ -void dCamera_c::radiusActorInSight(fopAc_ac_c* param_0, fopAc_ac_c* param_1, +f32 dCamera_c::radiusActorInSight(fopAc_ac_c* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2) { - // NONMATCHING + f32 var_f31 = radiusActorInSight(param_0, param_1, &field_0x5c.field_0x8, &field_0x5c.field_0x14, mFovY, mBank, 0.05f); + f32 var_f30 = radiusActorInSight(param_0, param_2, &field_0x5c.field_0x8, &field_0x5c.field_0x14, mFovY, mBank, 0.05f); + + f32 var_f29; + if (var_f31 > var_f30) { + var_f29 = var_f31; + } else { + var_f29 = var_f30; + } + + return var_f29; } /* 80167CB8-80167CD8 1625F8 0020+00 2/2 0/0 0/0 .text @@ -3453,18 +3024,57 @@ static void func_80167CB8(fopAc_ac_c* param_0) { } /* 80167CD8-80167E3C 162618 0164+00 2/2 0/0 0/0 .text jutOutCheck__9dCamera_cFP4cXyzf */ -void dCamera_c::jutOutCheck(cXyz* param_0, f32 param_1) { - // NONMATCHING +BOOL dCamera_c::jutOutCheck(cXyz* param_0, f32 param_1) { + cXyz spB4 = attentionPos(mpPlayerActor); + spB4 += (positionOf(mpPlayerActor) - spB4) * 0.5f; + + dBgS_CamLinChk linchk; + if (lineBGCheck(&spB4, param_0, &linchk, 0x40B7)) { + cM3dGPla plane; + dComIfG_Bgsp().GetTriPla(linchk, &plane); + + *param_0 = linchk.i_GetCross(); + *param_0 += *plane.GetNP() * param_1; + return TRUE; + } + + return FALSE; } /* 80167E3C-80167EF4 16277C 00B8+00 1/1 0/0 0/0 .text tooNearEscape__9dCamera_cFP4cXyz */ void dCamera_c::tooNearEscape(cXyz* param_0) { - // NONMATCHING + cXyz sp2C = attentionPos(mpPlayerActor); + cSGlobe sp58(*param_0 - sp2C); + + if (sp58.R() < 40.0f) { + sp58.R(40.0f); + *param_0 = sp2C + sp58.Xyz(); + } } /* 80167EF4-80167FEC 162834 00F8+00 2/2 0/0 0/0 .text getWaterSurfaceHeight__9dCamera_cFP4cXyz */ f32 dCamera_c::getWaterSurfaceHeight(cXyz* param_0) { - // NONMATCHING + f32 var_f31 = -1000000000.0f; + + cXyz spF8(*param_0); + dBgS_RoofChk roofchk; + roofchk.SetUnderwaterRoof(); + roofchk.i_SetPos(spF8); + + f32 roof_y = dComIfG_Bgsp().RoofChk(&roofchk); + if (spF8.y < roof_y) { + spF8.y = roof_y; + } + + dBgS_CamGndChk_Wtr gndchk; + gndchk.SetPos(&spF8); + + f32 gnd_y = dComIfG_Bgsp().GroundCross(&gndchk); + if (gnd_y > param_0->y) { + var_f31 = gnd_y; + } + + return var_f31; } /* ############################################################################################## */ @@ -4033,420 +3643,6 @@ bool dCamera_c::fixedPositionCamera(s32 param_0) { bool dCamera_c::oneSideCamera(s32 param_0){// NONMATCHING } -/* ############################################################################################## */ -/* 80393DC0-80393F58 020420 0198+00 1/1 0/0 0/0 .rodata @16654 */ -SECTION_RODATA static u8 const lit_16654[408] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80393DC0, &lit_16654); - /* 80393F68-80393F68 0205C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ #pragma push #pragma force_active on @@ -4464,7 +3660,84 @@ SECTION_DEAD static char const* const stringBase_803942F2 = "WideMode"; #pragma pop /* 8017F828-8018050C 17A168 0CE4+00 2/1 0/0 0/0 .text eventCamera__9dCamera_cFl */ -bool dCamera_c::eventCamera(s32 param_0){// NONMATCHING +bool dCamera_c::eventCamera(s32 param_0){ + // NONMATCHING + typedef int (dCamera_c::*func)(); + func l_func[] = { + &dCamera_c::pauseEvCamera, + &dCamera_c::pauseEvCamera, + &dCamera_c::talktoEvCamera, + &dCamera_c::fixedPositionEvCamera, + &dCamera_c::fixedFrameEvCamera, + &dCamera_c::uniformTransEvCamera, + &dCamera_c::watchActorEvCamera, + &dCamera_c::restorePosEvCamera, + &dCamera_c::getItemEvCamera, + &dCamera_c::gameOverEvCamera, + &dCamera_c::turnToActorEvCamera, + &dCamera_c::rollingEvCamera, + &dCamera_c::tactEvCamera, + &dCamera_c::pauseEvCamera, + &dCamera_c::portalWarpEvCamera, + &dCamera_c::styleEvCamera, + &dCamera_c::saveEvCamera, + &dCamera_c::loadEvCamera, + &dCamera_c::useItem0EvCamera, + &dCamera_c::useItem1EvCamera, + &dCamera_c::fixedFramesEvCamera, + &dCamera_c::bSplineEvCamera, + &dCamera_c::possessedEvCamera, + &dCamera_c::twoActor0EvCamera, + &dCamera_c::stokerEvCamera, + &dCamera_c::uniformBrakeEvCamera, + &dCamera_c::uniformAcceleEvCamera, + &dCamera_c::stbWaitEvCamera, + &dCamera_c::currentEvCamera, + &dCamera_c::peepHoleEvCamera, + &dCamera_c::digHoleEvCamera, + &dCamera_c::hintTalkEvCamera, + &dCamera_c::bspTransEvCamera, + (func)&dCamera_c::maptoolIdEvCamera, + }; + + static char* ActionNames[34] = { + "PAUSE", + "WAIT", + "TALK", + "FIXEDPOS", + "FIXEDFRM", + "UNITRANS", + "WATCHACTOR", + "RESTOREPOS", + "GETITEM", + "GAMEOVER", + "TURNTOACTOR", + "ROLLING", + "TACT", + "WINDDIR", + "PORTALWARP", + "STYLE", + "SAVE", + "LOAD", + "USEITEM0", + "USEITEM1", + "FIXEDFRMS", + "BSPLINE", + "POSSESSED", + "TWOACTOR0", + "STOKER", + "UNIBRAKE", + "UNIACCELE", + "STBWAIT", + "CURRENT", + "PEEPHOLE", + "DIGHOLE", + "HINTTALK", + "BSPTRANS", + "MAPTOOL", + }; + + (this->*l_func[0])(); } /* ############################################################################################## */ @@ -4477,12 +3750,12 @@ SECTION_DEAD static char const* const pad_80394304 = "\0\0\0"; #pragma pop /* 8018050C-801806D4 17AE4C 01C8+00 1/0 0/0 0/0 .text currentEvCamera__9dCamera_cFv */ -void dCamera_c::currentEvCamera() { +int dCamera_c::currentEvCamera() { // NONMATCHING } /* 801806D4-801806DC 17B014 0008+00 1/0 0/0 0/0 .text letCamera__9dCamera_cFl */ -bool dCamera_c::letCamera(s32 param_0) { +bool dCamera_c::letCamera(s32) { return true; } @@ -4500,122 +3773,249 @@ void dCamera_c::runEventRecoveryTrans() { /* 80180A40-80180AA8 17B380 0068+00 0/0 3/3 0/0 .text EventRecoverNotime__9dCamera_cFv */ void dCamera_c::EventRecoverNotime() { - // NONMATCHING + field_0x110.field_0x4 = 1; + Reset(field_0x110.field_0x8.mCenter, field_0x110.field_0x8.mEye, field_0x110.field_0x8.mFovy, field_0x110.field_0x8.mBank); } /* 80180AA8-80180AE0 17B3E8 0038+00 0/0 0/0 24/24 .text Set__9dCamera_cF4cXyz4cXyz */ -void dCamera_c::Set(cXyz param_0, cXyz param_1) { - // NONMATCHING +int dCamera_c::Set(cXyz i_center, cXyz i_eye) { + mCenter = i_center; + mEye = i_eye; + return 1; } /* 80180AE0-80180B40 17B420 0060+00 0/0 2/2 93/93 .text Set__9dCamera_cF4cXyz4cXyzfs */ -void dCamera_c::Set(cXyz param_0, cXyz param_1, f32 param_2, s16 param_3) { - // NONMATCHING +int dCamera_c::Set(cXyz i_center, cXyz i_eye, f32 i_fovy, s16 i_bank) { + mCenter = i_center; + mEye = i_eye; + mFovY = i_fovy; + mBank.Val(i_bank); + return 1; } /* 80180B40-80180BA0 17B480 0060+00 0/0 0/0 11/11 .text Set__9dCamera_cF4cXyz4cXyzsf */ -void dCamera_c::Set(cXyz param_0, cXyz param_1, s16 param_2, f32 param_3) { - // NONMATCHING +int dCamera_c::Set(cXyz i_center, cXyz i_eye, s16 i_bank, f32 i_fovy) { + mCenter = i_center; + mEye = i_eye; + mFovY = i_fovy; + mBank.Val(i_bank); + return 1; } /* 80180BA0-80180C18 17B4E0 0078+00 1/1 1/1 18/18 .text Reset__9dCamera_cF4cXyz4cXyzfs */ -void dCamera_c::Reset(cXyz param_0, cXyz param_1, f32 param_2, s16 param_3) { - // NONMATCHING +void dCamera_c::Reset(cXyz i_center, cXyz i_eye, f32 i_fovy, s16 i_bank) { + mCenter = i_center; + mEye = i_eye; + mFovY = i_fovy; + mBank = cSAngle(i_bank); + Reset(); } /* 80180C18-80180C68 17B558 0050+00 0/0 0/0 64/64 .text Reset__9dCamera_cF4cXyz4cXyz */ -void dCamera_c::Reset(cXyz param_0, cXyz param_1) { - // NONMATCHING +void dCamera_c::Reset(cXyz i_center, cXyz i_eye) { + mCenter = i_center; + mEye = i_eye; + Reset(); } /* 80180C68-80180D24 17B5A8 00BC+00 2/2 1/1 3/3 .text Reset__9dCamera_cFv */ -void dCamera_c::Reset(){// NONMATCHING +int dCamera_c::Reset() { + field_0x5c.field_0x8 = mCenter; + field_0x5c.field_0x14 = mEye; + field_0x80 = mFovY; + field_0x5c.field_0x20 = mBank; + field_0x28.Val(mEye - mCenter); + field_0x5c.field_0x0 = field_0x28; + field_0x8c = cSAngle(field_0x28.U().Inv()); + return 1; } -/* ############################################################################################## */ -/* 80393F58-80393F68 0205B8 0010+00 1/1 0/0 0/0 .rodata wave$17181 */ -SECTION_RODATA static u8 const wave[16] = { - 0x3E, - 0xCC, - 0xCC, - 0xCD, - 0x3F, - 0x66, - 0x66, - 0x66, - 0x40, - 0x06, - 0x66, - 0x66, - 0x40, - 0x4C, - 0xCC, - 0xCD, -}; -COMPILER_STRIP_GATE(0x80393F58, &wave); - -/* 80453908-8045390C 001F08 0004+00 1/1 0/0 0/0 .sdata2 @17253 */ -SECTION_SDATA2 static f32 lit_17253 = 43.0f / 100.0f; - -/* 8045390C-80453910 001F0C 0004+00 1/1 0/0 0/0 .sdata2 @17254 */ -SECTION_SDATA2 static f32 lit_17254 = 0.04500000178813934f; - -/* 80453910-80453914 001F10 0004+00 1/1 0/0 0/0 .sdata2 @17255 */ -SECTION_SDATA2 static f32 lit_17255 = 3.0f / 25.0f; - /* 80180D24-80181000 17B664 02DC+00 2/2 0/0 0/0 .text shakeCamera__9dCamera_cFv */ -void dCamera_c::shakeCamera(){// NONMATCHING +// NONMATCHING - minor regalloc +f32 dCamera_c::shakeCamera() { + static f32 const wave[] = {0.4f, 0.9f, 2.1f, 3.2f}; + + f32 var_f31 = 0.0f; + if (mShake.field_0x10 < mShake.m_length) { + int var_r29 = mShake.field_0x10 >> 3; + int var_r27 = mShake.field_0x10 & 7; + int var_r26 = (mShake.field_0x4[var_r29] << 8) | mShake.field_0x4[var_r29 + 1]; + int var_r28 = 1 << (15 - var_r27); + f32 var_f30 = 1.0f; + + for (int i = 0; i < 4; i++) { + if (var_r28 & var_r26) { + var_f31 += var_f30 * wave[i]; + } else { + var_f30 *= 0.43f; + } + + var_r28 >>= 1; + } + + mShake.field_0x10++; + + var_f31 *= cM_rndFX(0.05f) + 0.95f; + f32 var_f29 = var_f31; + + if (mShake.field_0x10 & 1) { + var_f31 = -var_f31; + } + + cXyz sp64(mShake.m_pos); + sp64.x += cM_rndFX(0.045f); + sp64.z += cM_rndFX(0.045f); + sp64 = sp64 * var_f31; + + if (field_0x6fc & 2) { + mShake.mEyeShake = sp64 * 1.0f; + mShake.field_0x24 = mShake.mEyeShake; + } + + if (field_0x6fc & 0x40) { + mShake.mEyeShake = sp64 * 10.0f; + mShake.field_0x24 = mShake.mEyeShake; + } + + if (field_0x6fc & 4) { + mShake.field_0x3c = var_f31 * cM_rndFX(0.12f); + } + + if (field_0x6fc & 8) { + mShake.field_0x40 = cSAngle(var_f31 * cM_rndFX(0.15f)); + } + + if (field_0x6fc & 0x10) { + mDoGph_gInf_c::setBlureRate(var_f29 * 30.0f); + mDoGph_gInf_c::onBlure(); + } + } else { + mShake.field_0x24 -= mShake.field_0x24 * 0.1f; + mShake.mEyeShake -= mShake.mEyeShake * 0.1f; + mShake.field_0x3c -= mShake.field_0x3c * 0.1f; + mShake.field_0x40 -= mShake.field_0x40 * 0.1f; + } + + return var_f31; } -/* ############################################################################################## */ /* 80453914-80453918 001F14 0004+00 1/1 0/0 0/0 .sdata2 * PatternLengthMax__Q29dCamera_c23@class$3669d_camera_cpp */ -SECTION_SDATA2 static u8 data_80453914[4] = { - 0x00, - 0x00, - 0x00, - 0x04, -}; +// supposed to be some anonymous static class member or something? +static const int PatternLengthMax[] = {0x00000004}; // array to make it go in correct section /* 80181000-80181158 17B940 0158+00 0/0 1/1 0/0 .text StartShake__9dCamera_cFlPUcl4cXyz */ -void dCamera_c::StartShake(s32 param_0, u8* param_1, s32 param_2, cXyz param_3) { - // NONMATCHING +int dCamera_c::StartShake(s32 i_length, u8* i_pattern, s32 i_flags, cXyz i_pos) { + if (i_length < 0 || i_length > (PatternLengthMax[0] << 3)) { + i_length = (PatternLengthMax[0] << 3); + } + + mShake.m_length = i_length; + + if (i_flags & 0x20) { + field_0x6fc &= ~0x20; + mBlure.field_0x4 = mBlure.field_0x14; + } + + int var_r31; + int var_r28 = i_length >> 3; + for (var_r31 = 0; var_r31 < PatternLengthMax[0]; var_r31++) { + mShake.field_0x0[var_r31] = mShake.field_0x4[var_r31] = 0; + } + + for (var_r31 = 0; var_r31 < var_r28; var_r31++) { + mShake.field_0x0[var_r31] = mShake.field_0x4[var_r31] = i_pattern[var_r31]; + } + + var_r28 = i_length & 7; + mShake.field_0x0[var_r31] = (0xFF << (8 - var_r28)) & i_pattern[var_r31]; + + if (i_length == (PatternLengthMax[0] << 3)) { + mShake.field_0x4[var_r31] = mShake.field_0x0[var_r31] | (i_pattern[0] >> var_r28); + } else { + mShake.field_0x4[var_r31] = mShake.field_0x0[var_r31]; + } + + mShake.m_pos = i_pos.norm(); + mShake.field_0x10 = 0; + field_0x6fc = i_flags; + return 1; } /* 80181158-80181170 17BA98 0018+00 0/0 1/1 0/0 .text StopShake__9dCamera_cFv */ -void dCamera_c::StopShake() { - // NONMATCHING +int dCamera_c::StopShake() { + mShake.m_length = 0; + mShake.field_0x10 = 0; + field_0x6fc = 0; + return 1; } /* 80181170-801811B8 17BAB0 0048+00 1/1 2/2 10/10 .text StartBlure__9dCamera_cFiP10fopAc_ac_cff */ -void dCamera_c::StartBlure(int param_0, fopAc_ac_c* param_1, f32 param_2, f32 param_3) { - // NONMATCHING +void dCamera_c::StartBlure(int param_0, fopAc_ac_c* i_actor, f32 i_alpha, f32 i_scale) { + mBlure.field_0x14 = param_0; + mBlure.mpActor = NULL; + mBlure.mAlpha = i_alpha; + + mBlure.mScale.x = i_scale; + mBlure.mScale.y = i_scale; + mBlure.mScale.z = 0.0f; + + mBlure.mpActor = i_actor; + + mBlure.mPosition.x = 0.5f; + mBlure.mPosition.y = 0.5f; + mBlure.mPosition.z = 0.0f; + + mBlure.field_0x8.x = 0; + mBlure.field_0x8.y = 0; + mBlure.field_0x8.z = 0; + mBlure.field_0x4 = param_0; } /* 801811B8-80181208 17BAF8 0050+00 0/0 0/0 1/1 .text ResetBlure__9dCamera_cFv */ void dCamera_c::ResetBlure() { - // NONMATCHING + mBlure.mpActor = NULL; + mBlure.mAlpha = 0.75f; + + mBlure.mPosition.x = 0.5f; + mBlure.mPosition.y = 0.5f; + mBlure.mPosition.z = 0.0f; + + mBlure.mScale.x = 1.0f; + mBlure.mScale.y = 1.0f; + mBlure.mScale.z = 0.0f; + + mBlure.field_0x8.x = 0; + mBlure.field_0x8.y = 0; + mBlure.field_0x8.z = 0; + mBlure.field_0x4 = 0; + mBlure.field_0x14 = 1; } /* 80181208-80181210 17BB48 0008+00 0/0 1/1 0/0 .text SetBlureAlpha__9dCamera_cFf */ -void dCamera_c::SetBlureAlpha(f32 param_0) { - // NONMATCHING +void dCamera_c::SetBlureAlpha(f32 i_alpha) { + mBlure.mAlpha = i_alpha; } /* 80181210-80181220 17BB50 0010+00 0/0 1/1 0/0 .text SetBlureScale__9dCamera_cFfff */ -void dCamera_c::SetBlureScale(f32 param_0, f32 param_1, f32 param_2) { - // NONMATCHING +void dCamera_c::SetBlureScale(f32 i_scalex, f32 i_scaley, f32 i_scalez) { + mBlure.mScale.x = i_scalex; + mBlure.mScale.y = i_scaley; + mBlure.mScale.z = i_scalez; } /* 80181220-80181278 17BB60 0058+00 0/0 1/1 0/0 .text SetBlurePosition__9dCamera_cFfff */ -void dCamera_c::SetBlurePosition(f32 param_0, f32 param_1, f32 param_2) { - // NONMATCHING +void dCamera_c::SetBlurePosition(f32 i_posx, f32 i_posy, f32 i_posz) { + SetBlureActor(NULL); + mBlure.mPosition.x = i_posx; + mBlure.mPosition.y = i_posy; + mBlure.mPosition.z = i_posz; } /* 80181278-80181280 -00001 0008+00 0/0 0/0 0/0 .text SetBlureActor__9dCamera_cFP10fopAc_ac_c */ -void dCamera_c::SetBlureActor(fopAc_ac_c* param_0) { - *(u32*)(((u8*)this) + 1808) /* this->field_0x710 */ = (u32)(param_0); +void dCamera_c::SetBlureActor(fopAc_ac_c* i_actor) { + mBlure.mpActor = i_actor; } /* ############################################################################################## */ @@ -4629,7 +4029,8 @@ void dCamera_c::blureCamera() { /* 80181490-80181500 17BDD0 0070+00 2/2 0/0 0/0 .text onHorseDush__9dCamera_cFv */ void dCamera_c::onHorseDush() { - // NONMATCHING + dComIfGp_getVibration().StartShock(VIBMODE_S_POWER2, 1, cXyz(0.0f, 1.0f, 0.0f)); + StartBlure(55, mpPlayerActor, 0.75f, 1.0f); } /* 80181500-80181534 17BE40 0034+00 1/1 1/1 5/5 .text GetForceLockOnActor__9dCamera_cFv @@ -4639,60 +4040,111 @@ fopAc_ac_c* dCamera_c::GetForceLockOnActor() { } /* 80181534-80181560 17BE74 002C+00 0/0 0/0 9/9 .text ForceLockOn__9dCamera_cFP10fopAc_ac_c */ -void dCamera_c::ForceLockOn(fopAc_ac_c* param_0) { - // NONMATCHING +int dCamera_c::ForceLockOn(fopAc_ac_c* i_actor) { + mForceLockTimer = 0; + mpLockOnActor = i_actor; + mLockOnActorID = fopAcM_GetID(i_actor); + return 1; } /* 80181560-8018159C 17BEA0 003C+00 1/1 0/0 0/0 .text ForceLockOff__9dCamera_cFUi */ -void dCamera_c::ForceLockOff(fpc_ProcID param_0) { - // NONMATCHING +int dCamera_c::ForceLockOff(fpc_ProcID i_id) { + if (i_id == mLockOnActorID || i_id == fpcM_ERROR_PROCESS_ID_e) { + mLockOnActorID = fpcM_ERROR_PROCESS_ID_e; + mpLockOnActor = NULL; + mForceLockTimer = 0; + return 1; + } + + return 0; } /* 8018159C-801815CC 17BEDC 0030+00 0/0 0/0 7/7 .text ForceLockOff__9dCamera_cFP10fopAc_ac_c */ -void dCamera_c::ForceLockOff(fopAc_ac_c* param_0) { - // NONMATCHING +int dCamera_c::ForceLockOff(fopAc_ac_c* i_actor) { + if (i_actor == mpLockOnActor) { + mLockOnActorID = fpcM_ERROR_PROCESS_ID_e; + mpLockOnActor = NULL; + mForceLockTimer = 0; + return 1; + } + + return 0; } /* 801815CC-801815F0 17BF0C 0024+00 0/0 0/0 5/5 .text dCam_getAngleY__FP12camera_class */ -void dCam_getAngleY(camera_class* param_0) { - // NONMATCHING +s16 dCam_getAngleY(camera_class* i_cam) { + return i_cam->mCamera.U(); } /* 801815F0-80181614 17BF30 0024+00 0/0 0/0 5/5 .text dCam_getAngleX__FP12camera_class */ -void dCam_getAngleX(camera_class* param_0) { - // NONMATCHING +s16 dCam_getAngleX(camera_class* i_cam) { + return i_cam->mCamera.V(); } /* 80181614-80181630 17BF54 001C+00 0/0 2/2 4/4 .text dCam_getControledAngleY__FP12camera_class */ -s16 dCam_getControledAngleY(camera_class* param_0) { - // NONMATCHING +s16 dCam_getControledAngleY(camera_class* i_cam) { + return i_cam->mCamera.U2(); } /* 80181630-80181640 17BF70 0010+00 1/1 1/1 0/0 .text dCam_getCamera__Fv */ camera_class* dCam_getCamera() { - // NONMATCHING + return dComIfGp_getCamera(0); } /* 80181640-80181664 17BF80 0024+00 0/0 43/43 91/91 .text dCam_getBody__Fv */ -dCamera_c* dCam_getBody(){// NONMATCHING +dCamera_c* dCam_getBody() { + return &dCam_getCamera()->mCamera; } -/* ############################################################################################## */ -/* 8045391C-80453920 001F1C 0004+00 2/2 0/0 0/0 .sdata2 @17525 */ -SECTION_SDATA2 static f32 lit_17525 = 19.0f / 14.0f; - /* 80181664-80181708 17BFA4 00A4+00 1/1 0/0 0/0 .text preparation__FP20camera_process_class */ -static void preparation(camera_process_class* param_0) { - // NONMATCHING +static void preparation(camera_process_class* i_this) { + camera_class* a_this = (camera_class*)i_this; + dCamera_c* camera = &a_this->mCamera; + + int camera_id = get_camera_id(a_this); + dDlst_window_c* window = get_window(camera_id); + view_port_class* viewport = window->getViewPort(); + f32 aspect = mDoGph_gInf_c::getAspect(); + + camera->SetWindow(viewport->width, viewport->height); + fopCamM_SetAspect(a_this, aspect); + + if (!daAlink_c::getE3Zhint()) { + dComIfGp_offCameraAttentionStatus(camera_id, 0x1002B); + } } /* 80181708-80181804 17C048 00FC+00 2/2 0/0 0/0 .text view_setup__FP20camera_process_class */ -static void view_setup(camera_process_class* param_0) { - // NONMATCHING +static void view_setup(camera_process_class* i_this) { + camera_class* a_this = (camera_class*)i_this; + dDlst_window_c* window = get_window(a_this); + + view_port_class* viewport = window->getViewPort(); + view_class* view = (view_class*)i_this; + mDoMtx_lookAt(view->viewMtx, &view->lookat.eye, &view->lookat.center, &view->lookat.up, view->bank); + MTXCopy(view->viewMtx, view->viewMtxNoTrans); + + view->viewMtxNoTrans[0][3] = 0.0f; + view->viewMtxNoTrans[1][3] = 0.0f; + view->viewMtxNoTrans[2][3] = 0.0f; + + dComIfGd_setWindow(window); + dComIfGd_setViewport(viewport); + dComIfGd_setView(view); + + f32 far; + if (getComStat(8)) { + far = view->far; + } else { + far = dStage_stagInfo_GetCullPoint(dComIfGp_getStageStagInfo()); + } + + mDoLib_clipper::setup(view->fovy, view->aspect, view->near, far); } /* 80181804-80181E20 17C144 061C+00 2/2 0/0 0/0 .text store__FP20camera_process_class */ -static void store(camera_process_class* param_0){// NONMATCHING +static void store(camera_process_class* param_0) { + // NONMATCHING } /* 80181E20-80181E64 17C760 0044+00 1/1 0/0 0/0 .text Up__9dCamera_cFv */ @@ -4706,7 +4158,7 @@ cXyz dCamera_c::Up() { /* 80181E64-80181E98 17C7A4 0034+00 1/1 1/1 30/30 .text Eye__9dCamera_cFv */ cXyz dCamera_c::Eye() { - return mEye + mShake.field_0x30; + return mEye + mShake.mEyeShake; } /* 80181E98-80181ECC 17C7D8 0034+00 1/1 1/1 25/25 .text Center__9dCamera_cFv */ @@ -4738,7 +4190,6 @@ static int camera_execute(camera_process_class* i_this) { return 1; } - /* 80181F70-801821E0 17C8B0 0270+00 1/0 0/0 0/0 .text camera_draw__FP20camera_process_class */ static int camera_draw(camera_process_class* i_this) { camera_class* a_this = (camera_class*)i_this; @@ -4794,7 +4245,6 @@ static int camera_draw(camera_process_class* i_this) { return 1; } - /* 801821E0-80182260 17CB20 0080+00 1/0 0/0 0/0 .text init_phase1__FP12camera_class */ static int init_phase1(camera_class* i_this) { int camera_id = get_camera_id(i_this); @@ -4811,10 +4261,6 @@ static int init_phase1(camera_class* i_this) { return cPhs_NEXT_e; } -/* ############################################################################################## */ -/* 80453920-80453924 001F20 0004+00 1/1 0/0 0/0 .sdata2 @17948 */ -SECTION_SDATA2 static f32 lit_17948 = 160000.0f; - /* 80182260-80182454 17CBA0 01F4+00 1/0 0/0 0/0 .text init_phase2__FP12camera_class */ static int init_phase2(camera_class* i_this) { camera_process_class* a_this = (camera_process_class*)i_this; @@ -4882,58 +4328,71 @@ static int init_phase2(camera_class* i_this) { /* 80182454-80182484 17CD94 0030+00 1/0 0/0 0/0 .text camera_create__FP12camera_class */ static int camera_create(camera_class* i_this) { + static request_of_phase_process_fn l_method[3] = { + (request_of_phase_process_fn)init_phase1, + (request_of_phase_process_fn)init_phase2, + (request_of_phase_process_fn)NULL, + }; + return dComLbG_PhaseHandler(&i_this->phase_request, l_method, i_this); } /* 80182484-801824C0 17CDC4 003C+00 1/0 0/0 0/0 .text camera_delete__FP20camera_process_class */ -// equivalent, instructions swapped -#ifdef NONMATCHING +// NONMATCHING - equivalent, instructions swapped static int camera_delete(camera_process_class* i_this) { - camera_class* a_this = (camera_class*)i_this; + dCamera_c* camera = &((camera_class*)i_this)->mCamera; - a_this->mCamera.~dCamera_c(); + camera->~dCamera_c(); dComIfGp_setCamera(0, NULL); return 1; } -#else -static void camera_delete(camera_process_class* param_0) { - // NONMATCHING -} -#endif /* 801824C0-801824C8 17CE00 0008+00 1/0 0/0 0/0 .text is_camera_delete__FPv */ static int is_camera_delete(void* i_this) { return 1; } -/* ############################################################################################## */ -/* 80453924-80453928 001F24 0004+00 1/1 0/0 0/0 .sdata2 @17979 */ -SECTION_SDATA2 static f32 lit_17979 = 240.0f; - /* 801824C8-80182560 17CE08 0098+00 1/1 0/0 0/0 .text Init__14dCamForcusLineFv */ void dCamForcusLine::Init() { - // NONMATCHING + field_0x49 = 0; + field_0x48 = 1; + field_0x38 = cXyz(320.0f, 240.0f, 0.0f); + + field_0x44.r = 0xFF; + field_0x44.g = 0xFF; + field_0x44.b = 0xFF; + field_0x44.a = 0x60; + + field_0x4c = 100; + field_0x50 = 100; + field_0x54 = 100; + field_0x58 = 0x50; + field_0x5a = 0; + field_0x5c = 4; + field_0x5e = 4; + field_0x68 = 180.0f; + field_0x6c = 0.0f; + field_0x60 = 180.0f; + field_0x64 = 60.0f; } /* 80182560-801825E4 17CEA0 0084+00 1/1 0/0 0/0 .text Draw__14dCamForcusLineFv */ void dCamForcusLine::Draw() { - // NONMATCHING + if (field_0x49) { + if (field_0x48 == 0) { + mEffectLine.initRnd(field_0x4c, field_0x50, field_0x54); + } + + mEffectLine.update(field_0x38, field_0x44, field_0x58, field_0x5a, field_0x5c, field_0x5e, field_0x60, field_0x64, field_0x68, field_0x6c); + } } /* 801825E4-801825FC 17CF24 0018+00 2/2 0/0 0/0 .text Off__14dCamForcusLineFv */ -void dCamForcusLine::Off() { - // NONMATCHING +bool dCamForcusLine::Off() { + field_0x49 = 0; + return field_0x49 == 0; } -/* 801825FC-801827EC 17CF3C 01F0+00 0/0 1/0 0/0 .text __sinit_d_camera_cpp */ -void __sinit_d_camera_cpp(){// NONMATCHING -} - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x801825FC, __sinit_d_camera_cpp); -#pragma pop - /* 801827EC-801827F4 17D12C 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_CamSphChkFv */ static void func_801827EC() { // NONMATCHING @@ -5043,3 +4502,51 @@ void clrFlag__9dCamera_cFUl() { void chkFlag__9dCamera_cFUl() { // NONMATCHING } + +/* 803BA6E4-803BA6F8 -00001 0014+00 2/0 0/0 0/0 .data method */ +SECTION_DATA static void* method[5] = { + (void*)camera_create__FP12camera_class, (void*)camera_delete__FP20camera_process_class, + (void*)camera_execute__FP20camera_process_class, (void*)is_camera_delete__FPv, + (void*)camera_draw__FP20camera_process_class, +}; + +/* 803BA6F8-803BA73C -00001 0044+00 0/0 0/0 1/0 .data g_profile_CAMERA */ +SECTION_DATA extern void* g_profile_CAMERA[17] = { + (void*)0xFFFFFFFD, (void*)0x000BFFFD, + (void*)0x030D0000, (void*)&g_fpcLf_Method, + (void*)0x00000D58, (void*)NULL, + (void*)NULL, (void*)&g_fopVw_Method, + (void*)NULL, (void*)&g_fopCam_Method, + (void*)NULL, (void*)NULL, + (void*)NULL, (void*)NULL, + (void*)NULL, (void*)&method, + (void*)NULL, +}; + +/* 803BA73C-803BA798 -00001 0044+18 0/0 0/0 1/0 .data g_profile_CAMERA2 */ +SECTION_DATA extern void* g_profile_CAMERA2[17 + 6 /* padding */] = { + (void*)0xFFFFFFFD, + (void*)0x000BFFFD, + (void*)0x030E0000, + (void*)&g_fpcLf_Method, + (void*)0x00000D58, + (void*)NULL, + (void*)NULL, + (void*)&g_fopVw_Method, + (void*)0x00010000, + (void*)&g_fopCam_Method, + (void*)NULL, + (void*)NULL, + (void*)NULL, + (void*)NULL, + (void*)NULL, + (void*)&method, + (void*)NULL, + /* padding */ + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, +}; diff --git a/src/d/d_cc_uty.cpp b/src/d/d_cc_uty.cpp index 3aa6a369ec..c1df3fb303 100644 --- a/src/d/d_cc_uty.cpp +++ b/src/d/d_cc_uty.cpp @@ -13,7 +13,7 @@ #include "f_op/f_op_actor_mng.h" bool daPy_py_c::checkWoodSwordEquip() { - return dComIfGs_getSelectEquipSword() == WOOD_STICK; + return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_WOOD_STICK; } BOOL daPy_py_c::checkNowWolf() { @@ -515,4 +515,4 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* i_enemy, dCcU_AtInfo* i_AtInfo) { } return i_AtInfo->mpActor; -} \ No newline at end of file +} diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index 7c4a066280..574b430982 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -63,7 +63,7 @@ void dComIfG_play_c::itemInit() { mNowOxygen = 600; mMaxOxygen = 600; - if (dComIfGs_checkGetItem(HAWK_EYE)) { + if (dComIfGs_checkGetItem(fpcNm_ITEM_HAWK_EYE)) { field_0x4f4b = 0; } else { field_0x4f4b = 21; @@ -1461,7 +1461,7 @@ u8 dComIfGs_getSelectMixItemNoArrowIndex(int i_selmixItemIdx) { return sel_item_slotNo; } - if (mix_item_slotNo != NO_ITEM && mix_item_slotNo >= SLOT_15 && mix_item_slotNo < SLOT_18) { + if (mix_item_slotNo != fpcNm_ITEM_NONE && mix_item_slotNo >= SLOT_15 && mix_item_slotNo < SLOT_18) { return mix_item_slotNo; } @@ -1483,17 +1483,17 @@ void dComIfGp_setSelectItem(int i_selItemIdx) { dComIfGs_setSelectItemIndex(i_selItemIdx, 0xFF); } } else { - g_dComIfG_gameInfo.play.setSelectItem(i_selItemIdx, NO_ITEM); + g_dComIfG_gameInfo.play.setSelectItem(i_selItemIdx, fpcNm_ITEM_NONE); } } else if (dComIfGs_getSelectItemIndex(i_selItemIdx) != 0xFF) { u8 item = dComIfGs_getItem(dComIfGs_getSelectItemIndex(i_selItemIdx), false); g_dComIfG_gameInfo.play.setSelectItem(i_selItemIdx, item); - if (item == NO_ITEM) { + if (item == fpcNm_ITEM_NONE) { dComIfGs_setSelectItemIndex(i_selItemIdx, 0xFF); } } else { - g_dComIfG_gameInfo.play.setSelectItem(i_selItemIdx, NO_ITEM); + g_dComIfG_gameInfo.play.setSelectItem(i_selItemIdx, fpcNm_ITEM_NONE); } } @@ -1506,35 +1506,35 @@ u8 dComIfGp_getSelectItem(int i_selItemIdx) { { u8 saveItem = dComIfGs_getItem(dComIfGs_getMixItemIndex(i_selItemIdx), false); - if (saveItem == BOW) { + if (saveItem == fpcNm_ITEM_BOW) { saveItem = playItem; - playItem = BOW; - } else if (saveItem == FISHING_ROD_1) { + playItem = fpcNm_ITEM_BOW; + } else if (saveItem == fpcNm_ITEM_FISHING_ROD_1) { saveItem = playItem; - playItem = FISHING_ROD_1; + playItem = fpcNm_ITEM_FISHING_ROD_1; } - if (playItem == BOW) { + if (playItem == fpcNm_ITEM_BOW) { switch (saveItem) { - case NORMAL_BOMB: - case WATER_BOMB: - case POKE_BOMB: - playItem = BOMB_ARROW; + case fpcNm_ITEM_NORMAL_BOMB: + case fpcNm_ITEM_WATER_BOMB: + case fpcNm_ITEM_POKE_BOMB: + playItem = fpcNm_ITEM_BOMB_ARROW; break; - case HAWK_EYE: - playItem = HAWK_ARROW; + case fpcNm_ITEM_HAWK_EYE: + playItem = fpcNm_ITEM_HAWK_ARROW; break; } - } else if (playItem == FISHING_ROD_1) { + } else if (playItem == fpcNm_ITEM_FISHING_ROD_1) { switch (saveItem) { - case BEE_CHILD: - playItem = BEE_ROD; + case fpcNm_ITEM_BEE_CHILD: + playItem = fpcNm_ITEM_BEE_ROD; break; - case WORM: - playItem = WORM_ROD; + case fpcNm_ITEM_WORM: + playItem = fpcNm_ITEM_WORM_ROD; break; - case ZORAS_JEWEL: - playItem = JEWEL_ROD; + case fpcNm_ITEM_ZORAS_JEWEL: + playItem = fpcNm_ITEM_JEWEL_ROD; break; } } @@ -1652,10 +1652,10 @@ JKRExpHeap* dComIfGp_getSubHeap2D(int flag) { u8 dComIfGs_checkGetInsectNum() { static u8 l_itemno[24] = { - M_BEETLE, F_BEETLE, M_BUTTERFLY, F_BUTTERFLY, M_STAG_BEETLE, F_STAG_BEETLE, - M_GRASSHOPPER, F_GRASSHOPPER, M_NANAFUSHI, F_NANAFUSHI, M_DANGOMUSHI, F_DANGOMUSHI, - M_MANTIS, F_MANTIS, M_LADYBUG, F_LADYBUG, M_SNAIL, F_SNAIL, - M_DRAGONFLY, F_DRAGONFLY, M_ANT, F_ANT, M_MAYFLY, F_MAYFLY, + fpcNm_ITEM_M_BEETLE, fpcNm_ITEM_F_BEETLE, fpcNm_ITEM_M_BUTTERFLY, fpcNm_ITEM_F_BUTTERFLY, fpcNm_ITEM_M_STAG_BEETLE, fpcNm_ITEM_F_STAG_BEETLE, + fpcNm_ITEM_M_GRASSHOPPER, fpcNm_ITEM_F_GRASSHOPPER, fpcNm_ITEM_M_NANAFUSHI, fpcNm_ITEM_F_NANAFUSHI, fpcNm_ITEM_M_DANGOMUSHI, fpcNm_ITEM_F_DANGOMUSHI, + fpcNm_ITEM_M_MANTIS, fpcNm_ITEM_F_MANTIS, fpcNm_ITEM_M_LADYBUG, fpcNm_ITEM_F_LADYBUG, fpcNm_ITEM_M_SNAIL, fpcNm_ITEM_F_SNAIL, + fpcNm_ITEM_M_DRAGONFLY, fpcNm_ITEM_F_DRAGONFLY, fpcNm_ITEM_M_ANT, fpcNm_ITEM_F_ANT, fpcNm_ITEM_M_MAYFLY, fpcNm_ITEM_F_MAYFLY, }; u8 insectCount = 0; @@ -1706,14 +1706,14 @@ s16 dComIfGp_getSelectItemNum(int i_selItemIdx) { u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx); s16 itemNum = 0; - if (selectItem == NORMAL_BOMB || selectItem == WATER_BOMB || selectItem == POKE_BOMB || - selectItem == BOMB_ARROW) + if (selectItem == fpcNm_ITEM_NORMAL_BOMB || selectItem == fpcNm_ITEM_WATER_BOMB || selectItem == fpcNm_ITEM_POKE_BOMB || + selectItem == fpcNm_ITEM_BOMB_ARROW) { selectItem = dComIfGs_getSelectMixItemNoArrowIndex(i_selItemIdx) - SLOT_15; itemNum = dComIfGs_getBombNum(selectItem); - } else if (selectItem == PACHINKO) { + } else if (selectItem == fpcNm_ITEM_PACHINKO) { itemNum = dComIfGs_getPachinkoNum(); - } else if (selectItem == BEE_CHILD) { + } else if (selectItem == fpcNm_ITEM_BEE_CHILD) { itemNum = dComIfGs_getBottleNum(dComIfGs_getSelectItemIndex(i_selItemIdx) - SLOT_11); } @@ -1725,15 +1725,15 @@ int dComIfGp_getSelectItemMaxNum(int i_selItemIdx) { u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx); int itemNum = 0; - if (selectItem == BOMB_BAG_LV1) { + if (selectItem == fpcNm_ITEM_BOMB_BAG_LV1) { itemNum = 1; - } else if (selectItem == NORMAL_BOMB || selectItem == WATER_BOMB || selectItem == POKE_BOMB || - selectItem == BOMB_ARROW) + } else if (selectItem == fpcNm_ITEM_NORMAL_BOMB || selectItem == fpcNm_ITEM_WATER_BOMB || selectItem == fpcNm_ITEM_POKE_BOMB || + selectItem == fpcNm_ITEM_BOMB_ARROW) { itemNum = dComIfGs_getBombMax(selectItem); - } else if (selectItem == PACHINKO) { + } else if (selectItem == fpcNm_ITEM_PACHINKO) { itemNum = dComIfGs_getPachinkoMax(); - } else if (selectItem == BEE_CHILD) { + } else if (selectItem == fpcNm_ITEM_BEE_CHILD) { itemNum = dComIfGs_getBottleMax(); } @@ -1744,8 +1744,8 @@ int dComIfGp_getSelectItemMaxNum(int i_selItemIdx) { void dComIfGp_setSelectItemNum(int i_selItemIdx, s16 i_num) { u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx); - if (selectItem == NORMAL_BOMB || selectItem == WATER_BOMB || selectItem == POKE_BOMB || - selectItem == BOMB_ARROW) + if (selectItem == fpcNm_ITEM_NORMAL_BOMB || selectItem == fpcNm_ITEM_WATER_BOMB || selectItem == fpcNm_ITEM_POKE_BOMB || + selectItem == fpcNm_ITEM_BOMB_ARROW) { u8 mix_slotNo = dComIfGs_getSelectMixItemNoArrowIndex(i_selItemIdx) - SLOT_15; @@ -1753,9 +1753,9 @@ void dComIfGp_setSelectItemNum(int i_selItemIdx, s16 i_num) { i_num = dComIfGs_getBombMax(selectItem); } dComIfGs_setBombNum(mix_slotNo, i_num); - } else if (selectItem == PACHINKO) { + } else if (selectItem == fpcNm_ITEM_PACHINKO) { dComIfGs_setPachinkoNum(i_num); - } else if (selectItem == BEE_CHILD) { + } else if (selectItem == fpcNm_ITEM_BEE_CHILD) { u8 bottle_slot_no = dComIfGs_getSelectItemIndex(i_selItemIdx) - SLOT_11; if (i_num > dComIfGs_getBottleMax()) { @@ -1769,14 +1769,14 @@ void dComIfGp_setSelectItemNum(int i_selItemIdx, s16 i_num) { void dComIfGp_addSelectItemNum(int i_selItemIdx, s16 i_num) { u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx); - if (selectItem == NORMAL_BOMB || selectItem == WATER_BOMB || selectItem == POKE_BOMB || - selectItem == BOMB_ARROW) + if (selectItem == fpcNm_ITEM_NORMAL_BOMB || selectItem == fpcNm_ITEM_WATER_BOMB || selectItem == fpcNm_ITEM_POKE_BOMB || + selectItem == fpcNm_ITEM_BOMB_ARROW) { u8 slot_no = dComIfGs_getSelectMixItemNoArrowIndex(i_selItemIdx) - SLOT_15; dComIfGp_setItemBombNumCount(slot_no, i_num); - } else if (selectItem == PACHINKO) { + } else if (selectItem == fpcNm_ITEM_PACHINKO) { dComIfGp_setItemPachinkoNumCount(i_num); - } else if (selectItem == BEE_CHILD) { + } else if (selectItem == fpcNm_ITEM_BEE_CHILD) { dComIfGs_addBottleNum(dComIfGs_getSelectItemIndex(i_selItemIdx) - SLOT_11, i_num); } } @@ -1965,16 +1965,16 @@ void dComIfGs_setSelectEquipClothes(u8 i_itemNo) { */ void dComIfGs_setSelectEquipSword(u8 i_itemNo) { switch (i_itemNo) { - case SWORD: + case fpcNm_ITEM_SWORD: dComIfGs_setCollectSword(COLLECT_ORDON_SWORD); break; - case MASTER_SWORD: + case fpcNm_ITEM_MASTER_SWORD: dComIfGs_setCollectSword(COLLECT_MASTER_SWORD); break; - case WOOD_STICK: + case fpcNm_ITEM_WOOD_STICK: dComIfGs_setCollectSword(COLLECT_WOODEN_SWORD); break; - case LIGHT_SWORD: + case fpcNm_ITEM_LIGHT_SWORD: dComIfGs_setCollectSword(COLLECT_LIGHT_SWORD); break; } @@ -1986,13 +1986,13 @@ void dComIfGs_setSelectEquipSword(u8 i_itemNo) { */ void dComIfGs_setSelectEquipShield(u8 i_itemNo) { switch (i_itemNo) { - case WOOD_SHIELD: + case fpcNm_ITEM_WOOD_SHIELD: dComIfGs_setCollectShield(COLLECT_WOODEN_SHIELD); break; - case SHIELD: + case fpcNm_ITEM_SHIELD: dComIfGs_setCollectShield(COLLECT_ORDON_SHIELD); break; - case HYLIA_SHIELD: + case fpcNm_ITEM_HYLIA_SHIELD: dComIfGs_setCollectShield(COLLECT_HYLIAN_SHIELD); break; } diff --git a/src/d/d_ev_camera.cpp b/src/d/d_ev_camera.cpp index b84a5bbeb8..4b34ff5e08 100644 --- a/src/d/d_ev_camera.cpp +++ b/src/d/d_ev_camera.cpp @@ -741,7 +741,7 @@ SECTION_SDATA2 static u8 lit_5144[8] = { SECTION_SDATA2 static f32 lit_5145 = 182.04444885253906f; /* 800897E8-8008A510 084128 0D28+00 0/0 1/0 0/0 .text fixedFrameEvCamera__9dCamera_cFv */ -void dCamera_c::fixedFrameEvCamera() { +int dCamera_c::fixedFrameEvCamera() { // NONMATCHING } @@ -763,7 +763,7 @@ SECTION_DEAD static char const* const stringBase_8037AB66 = "@PLAYER"; SECTION_SDATA2 static f32 lit_5346 = 1.0f; /* 8008A510-8008A974 084E50 0464+00 0/0 1/0 0/0 .text stokerEvCamera__9dCamera_cFv */ -void dCamera_c::stokerEvCamera() { +int dCamera_c::stokerEvCamera() { // NONMATCHING } @@ -788,7 +788,7 @@ SECTION_SDATA2 static f32 lit_5844[1 + 1 /* padding */] = { SECTION_SDATA2 static f64 lit_5846 = 4503599627370496.0 /* cast u32 to float */; /* 8008A974-8008B9B0 0852B4 103C+00 0/0 1/0 0/0 .text rollingEvCamera__9dCamera_cFv */ -void dCamera_c::rollingEvCamera() { +int dCamera_c::rollingEvCamera() { // NONMATCHING } @@ -829,25 +829,25 @@ SECTION_SDATA2 static f64 lit_5962 = 4503601774854144.0 /* cast s32 to float */; /* 8008B9B0-8008BE2C 0862F0 047C+00 0/0 1/0 0/0 .text fixedPositionEvCamera__9dCamera_cFv */ -void dCamera_c::fixedPositionEvCamera() { +int dCamera_c::fixedPositionEvCamera() { // NONMATCHING } /* 8008BE2C-8008BE50 08676C 0024+00 0/0 1/0 0/0 .text uniformTransEvCamera__9dCamera_cFv */ -void dCamera_c::uniformTransEvCamera() { +int dCamera_c::uniformTransEvCamera() { transEvCamera(1); } /* 8008BE50-8008BE74 086790 0024+00 0/0 1/0 0/0 .text uniformBrakeEvCamera__9dCamera_cFv */ -void dCamera_c::uniformBrakeEvCamera() { +int dCamera_c::uniformBrakeEvCamera() { transEvCamera(2); } /* 8008BE74-8008BE98 0867B4 0024+00 0/0 1/0 0/0 .text uniformAcceleEvCamera__9dCamera_cFv */ -void dCamera_c::uniformAcceleEvCamera() { +int dCamera_c::uniformAcceleEvCamera() { transEvCamera(3); } @@ -991,7 +991,7 @@ SECTION_SDATA2 static f32 lit_7346 = 1.0f / 10.0f; SECTION_SDATA2 static f32 lit_7347 = 30.0f; /* 8008E938-8008FA58 089278 1120+00 0/0 1/0 0/0 .text watchActorEvCamera__9dCamera_cFv */ -void dCamera_c::watchActorEvCamera() { +int dCamera_c::watchActorEvCamera() { // NONMATCHING } @@ -1027,12 +1027,12 @@ static u8 lit_7364[12]; static f32 DefaultGap_7363[3]; /* 8008FAE8-80090174 08A428 068C+00 0/0 1/0 0/0 .text restorePosEvCamera__9dCamera_cFv */ -void dCamera_c::restorePosEvCamera() { +int dCamera_c::restorePosEvCamera() { // NONMATCHING } /* 80090174-80090230 08AAB4 00BC+00 0/0 1/0 0/0 .text talktoEvCamera__9dCamera_cFv */ -void dCamera_c::talktoEvCamera() { +int dCamera_c::talktoEvCamera() { dComIfGp_event_getPt1(); s32 style = mCamTypeData[mEventData.field_0xc].field_0x18[field_0x190][3]; @@ -1155,7 +1155,7 @@ SECTION_DEAD static char const* const stringBase_8037AC6A = "FN01"; #pragma pop /* 80090478-80090514 08ADB8 009C+00 0/0 1/0 0/0 .text styleEvCamera__9dCamera_cFv */ -bool dCamera_c::styleEvCamera() { +int dCamera_c::styleEvCamera() { if (mCurCamTypeTimer == 0) { mEventData.field_0x8 = 0; field_0x160 = 0; @@ -1166,7 +1166,6 @@ bool dCamera_c::styleEvCamera() { return isModeOK(); } - /* ############################################################################################## */ /* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ #pragma push @@ -1322,7 +1321,7 @@ SECTION_SDATA2 static f32 lit_8225 = 350.0f; SECTION_SDATA2 static f32 lit_8226 = 49.0f / 50.0f; /* 80090514-80091468 08AE54 0F54+00 0/0 1/0 0/0 .text gameOverEvCamera__9dCamera_cFv */ -void dCamera_c::gameOverEvCamera() { +int dCamera_c::gameOverEvCamera() { // NONMATCHING } @@ -1505,7 +1504,7 @@ SECTION_SDATA2 static f32 lit_8752 = -30.0f; SECTION_SDATA2 static f32 lit_8753 = -160.0f; /* 80091468-8009236C 08BDA8 0F04+00 1/0 1/0 0/0 .text tactEvCamera__9dCamera_cFv */ -void dCamera_c::tactEvCamera() { +int dCamera_c::tactEvCamera() { // NONMATCHING } @@ -1519,12 +1518,12 @@ extern "C" void dComIfGp_saveCameraPosition__FiP4cXyzP4cXyzfs() { /* 800923B8-800923C0 08CCF8 0008+00 0/0 1/0 0/0 .text turnToActorEvCamera__9dCamera_cFv */ -bool dCamera_c::turnToActorEvCamera() { +int dCamera_c::turnToActorEvCamera() { return true; } /* 800923C0-800924D0 08CD00 0110+00 0/0 1/0 0/0 .text stbWaitEvCamera__9dCamera_cFv */ -bool dCamera_c::stbWaitEvCamera() { +int dCamera_c::stbWaitEvCamera() { dDemo_camera_c* demo_cam = dDemo_c::getCamera(); #if DEBUG char* enabled_report = "-----"; @@ -1580,7 +1579,7 @@ bool dCamera_c::stbWaitEvCamera() { /* 800924D0-8009258C 08CE10 00BC+00 0/0 1/0 0/0 .text saveEvCamera__9dCamera_cFv */ -bool dCamera_c::saveEvCamera() { +int dCamera_c::saveEvCamera() { int slot; getEvIntData(&slot, "Slot", 0); @@ -1603,7 +1602,7 @@ SECTION_RODATA static u8 const lit_8840[24] = { COMPILER_STRIP_GATE(0x8037A884, &lit_8840); /* 8009258C-800929AC 08CECC 0420+00 0/0 1/0 0/0 .text loadEvCamera__9dCamera_cFv */ -void dCamera_c::loadEvCamera() { +int dCamera_c::loadEvCamera() { // NONMATCHING } @@ -1778,7 +1777,7 @@ SECTION_SDATA2 static f32 lit_9440 = 270.0f; SECTION_SDATA2 static f32 lit_9441 = 300.0f; /* 800929AC-800937AC 08D2EC 0E00+00 0/0 1/0 0/0 .text useItem0EvCamera__9dCamera_cFv */ -void dCamera_c::useItem0EvCamera() { +int dCamera_c::useItem0EvCamera() { // NONMATCHING } @@ -1805,7 +1804,7 @@ SECTION_SDATA2 static f32 lit_9800 = -180.0f; SECTION_SDATA2 static f32 lit_9801 = 170.0f; /* 800937AC-80094240 08E0EC 0A94+00 0/0 1/0 0/0 .text useItem1EvCamera__9dCamera_cFv */ -void dCamera_c::useItem1EvCamera() { +int dCamera_c::useItem1EvCamera() { // NONMATCHING } @@ -1863,7 +1862,7 @@ SECTION_SDATA2 static f32 lit_10125 = -164.0f; SECTION_SDATA2 static f32 lit_10126 = -220.0f; /* 80094240-80094A70 08EB80 0830+00 0/0 1/0 0/0 .text getItemEvCamera__9dCamera_cFv */ -void dCamera_c::getItemEvCamera() { +int dCamera_c::getItemEvCamera() { // NONMATCHING } @@ -1896,7 +1895,7 @@ SECTION_SDATA2 static f32 lit_10283 = 9.0f / 100.0f; SECTION_SDATA2 static f32 lit_10284 = 9.0f / 50.0f; /* 80094A70-80095010 08F3B0 05A0+00 0/0 1/0 0/0 .text possessedEvCamera__9dCamera_cFv */ -void dCamera_c::possessedEvCamera() { +int dCamera_c::possessedEvCamera() { // NONMATCHING } @@ -1915,12 +1914,12 @@ SECTION_SDATA2 static f32 lit_10437 = 1.0f / 100.0f; /* 80095010-8009544C 08F950 043C+00 0/0 1/0 0/0 .text fixedFramesEvCamera__9dCamera_cFv */ -void dCamera_c::fixedFramesEvCamera() { +int dCamera_c::fixedFramesEvCamera() { // NONMATCHING } /* 8009544C-800956E4 08FD8C 0298+00 0/0 1/0 0/0 .text bSplineEvCamera__9dCamera_cFv */ -void dCamera_c::bSplineEvCamera() { +int dCamera_c::bSplineEvCamera() { // NONMATCHING } @@ -1956,12 +1955,12 @@ SECTION_SDATA2 static f32 lit_10781 = 10000.0f; SECTION_SDATA2 static f32 lit_10782 = 0.25f; /* 800956E4-80095E7C 090024 0798+00 0/0 1/0 0/0 .text twoActor0EvCamera__9dCamera_cFv */ -void dCamera_c::twoActor0EvCamera() { +int dCamera_c::twoActor0EvCamera() { // NONMATCHING } /* 80095E7C-80095FD0 0907BC 0154+00 0/0 1/0 0/0 .text peepHoleEvCamera__9dCamera_cFv */ -void dCamera_c::peepHoleEvCamera() { +int dCamera_c::peepHoleEvCamera() { // NONMATCHING } @@ -1976,7 +1975,7 @@ SECTION_DEAD static char const* const stringBase_8037AD14 = "R_SP01"; SECTION_SDATA2 static f32 lit_11068 = 245.0f; /* 80095FD0-800965AC 090910 05DC+00 0/0 1/0 0/0 .text digHoleEvCamera__9dCamera_cFv */ -void dCamera_c::digHoleEvCamera() { +int dCamera_c::digHoleEvCamera() { // NONMATCHING } @@ -2023,7 +2022,7 @@ SECTION_SDATA2 static f32 lit_11421 = 0.75f; SECTION_SDATA2 static f32 lit_11422 = 2.0f / 5.0f; /* 800965AC-80096EDC 090EEC 0930+00 0/0 1/0 0/0 .text hintTalkEvCamera__9dCamera_cFv */ -void dCamera_c::hintTalkEvCamera() { +int dCamera_c::hintTalkEvCamera() { // NONMATCHING } @@ -2050,12 +2049,12 @@ SECTION_DEAD static char const* const pad_8037AD67 = ""; #pragma pop /* 80096EDC-80097694 09181C 07B8+00 0/0 1/0 0/0 .text bspTransEvCamera__9dCamera_cFv */ -void dCamera_c::bspTransEvCamera() { +int dCamera_c::bspTransEvCamera() { // NONMATCHING } /* 80097694-8009769C 091FD4 0008+00 0/0 1/0 0/0 .text portalWarpEvCamera__9dCamera_cFv */ -bool dCamera_c::portalWarpEvCamera() { +int dCamera_c::portalWarpEvCamera() { return true; } @@ -2170,4 +2169,4 @@ extern "C" void getShadowTalkAtnPos__9daAlink_cFv() { // NONMATCHING } -/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8037AAF4-8037AAF4 007154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp index 2b19f0af13..13d55cd8df 100644 --- a/src/d/d_event.cpp +++ b/src/d/d_event.cpp @@ -285,7 +285,7 @@ int dEvt_control_c::talkXyCheck(dEvt_order_c* p_order) { return 0; } - if (dComIfGp_getSelectItem(itemIndex) == NO_ITEM) { + if (dComIfGp_getSelectItem(itemIndex) == fpcNm_ITEM_NONE) { return 0; } @@ -503,7 +503,7 @@ int dEvt_control_c::endProc() { field_0xec = 255; field_0xed = 0; mEventID = 255; - mPreItemNo = NO_ITEM; + mPreItemNo = fpcNm_ITEM_NONE; dComIfGp_getEventManager().setStartDemo(-2); return 1; } @@ -1049,7 +1049,7 @@ void dEvt_control_c::remove() { mStageEventDt = NULL; mEventID = 255; field_0xed = 0; - mPreItemNo = NO_ITEM; + mPreItemNo = fpcNm_ITEM_NONE; mEventFlag = 0; mFlag2 = 0; mChangeOK = NULL; diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index 4d2aab4be6..a77857e306 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -162,7 +162,7 @@ int dGameover_c::_create() { if (!strcmp(dComIfGp_getLastPlayStageName(), "D_MN10A")) { // Last stage was Stallord Arena // Remove Ooccoo from inventory - dComIfGs_setItem(SLOT_18, NO_ITEM); + dComIfGs_setItem(SLOT_18, fpcNm_ITEM_NONE); dComIfGs_resetLastWarpAcceptStage(); } @@ -340,8 +340,8 @@ void dGameover_c::saveClose_proc() { } // Reset Lantern and oil status back into inventory if gameover during monkey steal sequence - if (dComIfGs_isItemFirstBit(KANTERA) && dComIfGs_getItem(SLOT_1, true) == NO_ITEM) { - dComIfGs_setItem(SLOT_1, KANTERA); + if (dComIfGs_isItemFirstBit(fpcNm_ITEM_KANTERA) && dComIfGs_getItem(SLOT_1, true) == fpcNm_ITEM_NONE) { + dComIfGs_setItem(SLOT_1, fpcNm_ITEM_KANTERA); dComIfGs_setOil(dMeter2Info_getOilGaugeBackUp()); } diff --git a/src/d/d_insect.cpp b/src/d/d_insect.cpp index 201d9ec2cd..f69f76334a 100644 --- a/src/d/d_insect.cpp +++ b/src/d/d_insect.cpp @@ -31,7 +31,7 @@ dInsect_c::dInsect_c() { field_0x56C = 0; mDraw = true; m_mode = 0; - m_itemNo = M_MAYFLY; + m_itemNo = fpcNm_ITEM_M_MAYFLY; field_0x584 = 0; field_0x585 = 0; } @@ -80,7 +80,7 @@ void dInsect_c::Insect_GetDemoMain() { mDraw = true; m_mode = 0; if (field_0x584 == 0) { - fopAcM_createItem(¤t.pos, HEART, -1, -1, NULL, NULL, 0); + fopAcM_createItem(¤t.pos, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0); field_0x584 = 1; } } else { diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp index 7df1ea0a1a..5caed6dac8 100644 --- a/src/d/d_item.cpp +++ b/src/d/d_item.cpp @@ -589,19 +589,19 @@ void item_func_L_MAGIC() { } void item_func_BOMB_5() { - addBombCount(NORMAL_BOMB, 5); + addBombCount(fpcNm_ITEM_NORMAL_BOMB, 5); } void item_func_BOMB_10() { - addBombCount(NORMAL_BOMB, 10); + addBombCount(fpcNm_ITEM_NORMAL_BOMB, 10); } void item_func_BOMB_20() { - addBombCount(NORMAL_BOMB, 20); + addBombCount(fpcNm_ITEM_NORMAL_BOMB, 20); } void item_func_BOMB_30() { - addBombCount(NORMAL_BOMB, 30); + addBombCount(fpcNm_ITEM_NORMAL_BOMB, 30); } void item_func_ARROW_10() { @@ -625,31 +625,31 @@ void item_func_PACHINKO_SHOT() { } void item_func_WATER_BOMB_5() { - addBombCount(WATER_BOMB, 5); + addBombCount(fpcNm_ITEM_WATER_BOMB, 5); } void item_func_WATER_BOMB_10() { - addBombCount(WATER_BOMB, 10); + addBombCount(fpcNm_ITEM_WATER_BOMB, 10); } void item_func_WATER_BOMB_20() { - addBombCount(WATER_BOMB, 15); + addBombCount(fpcNm_ITEM_WATER_BOMB, 15); } void item_func_WATER_BOMB_30() { - addBombCount(WATER_BOMB, 3); + addBombCount(fpcNm_ITEM_WATER_BOMB, 3); } void item_func_BOMB_INSECT_5() { - addBombCount(POKE_BOMB, 5); + addBombCount(fpcNm_ITEM_POKE_BOMB, 5); } void item_func_BOMB_INSECT_10() { - addBombCount(POKE_BOMB, 10); + addBombCount(fpcNm_ITEM_POKE_BOMB, 10); } void item_func_BOMB_INSECT_20() { - addBombCount(POKE_BOMB, 3); + addBombCount(fpcNm_ITEM_POKE_BOMB, 3); } void item_func_BOMB_INSECT_30() {} @@ -689,7 +689,7 @@ void item_func_COMPUS() { void item_func_DUNGEON_EXIT() { dComIfGs_onDungeonItemWarp(); - dComIfGs_setItem(SLOT_18, DUNGEON_EXIT); + dComIfGs_setItem(SLOT_18, fpcNm_ITEM_DUNGEON_EXIT); } void item_func_BOSS_KEY() { @@ -697,22 +697,22 @@ void item_func_BOSS_KEY() { } void item_func_DUNGEON_BACK() { - dComIfGs_setItem(SLOT_18, DUNGEON_BACK); + dComIfGs_setItem(SLOT_18, fpcNm_ITEM_DUNGEON_BACK); } void item_func_SWORD() { dComIfGs_setCollectSword(COLLECT_ORDON_SWORD); - dComIfGs_setSelectEquipSword(SWORD); + dComIfGs_setSelectEquipSword(fpcNm_ITEM_SWORD); } void item_func_MASTER_SWORD() { dComIfGs_setCollectSword(COLLECT_MASTER_SWORD); - dComIfGs_setSelectEquipSword(MASTER_SWORD); + dComIfGs_setSelectEquipSword(fpcNm_ITEM_MASTER_SWORD); } void item_func_WOOD_SHIELD() { dComIfGs_setCollectShield(COLLECT_WOODEN_SHIELD); - dComIfGs_setSelectEquipShield(WOOD_SHIELD); + dComIfGs_setSelectEquipShield(fpcNm_ITEM_WOOD_SHIELD); } void item_func_SHIELD() {} @@ -720,16 +720,16 @@ void item_func_SHIELD() {} void item_func_HYLIA_SHIELD() {} void item_func_TKS_LETTER() { - dComIfGs_setItem(SLOT_18, TKS_LETTER); + dComIfGs_setItem(SLOT_18, fpcNm_ITEM_TKS_LETTER); } void item_func_WEAR_CASUAL() { - dComIfGs_setSelectEquipClothes(WEAR_CASUAL); + dComIfGs_setSelectEquipClothes(fpcNm_ITEM_WEAR_CASUAL); } void item_func_WEAR_KOKIRI() { dComIfGs_setCollectClothes(KOKIRI_CLOTHES_FLAG); - dComIfGs_setSelectEquipClothes(WEAR_KOKIRI); + dComIfGs_setSelectEquipClothes(fpcNm_ITEM_WEAR_KOKIRI); } void item_func_ARMOR() {} @@ -742,7 +742,7 @@ void item_func_MAGIC_LV1() { } void item_func_DUNGEON_EXIT_2() { - dComIfGs_setItem(SLOT_18, DUNGEON_EXIT); + dComIfGs_setItem(SLOT_18, fpcNm_ITEM_DUNGEON_EXIT); } void item_func_WALLET_LV1() { @@ -761,95 +761,95 @@ void item_func_ZORAS_JEWEL() { if (item_getcheck_func_FISHING_ROD_1()) { dComIfGs_setRodTypeLevelUp(); } else { - dComIfGs_setItem(SLOT_20, ZORAS_JEWEL); + dComIfGs_setItem(SLOT_20, fpcNm_ITEM_ZORAS_JEWEL); } } void item_func_HAWK_EYE() { - dComIfGs_setItem(SLOT_5, HAWK_EYE); + dComIfGs_setItem(SLOT_5, fpcNm_ITEM_HAWK_EYE); } /* 800986C4-80098718 093004 0054+00 1/0 0/0 0/0 .text item_func_WOOD_STICK__Fv */ void item_func_WOOD_STICK() { dComIfGs_setCollectSword(COLLECT_WOODEN_SWORD); - dComIfGs_setSelectEquipSword(WOOD_STICK); + dComIfGs_setSelectEquipSword(fpcNm_ITEM_WOOD_STICK); s32 roomNo = dComIfGp_roomControl_getStayNo(); dComIfGs_onSwitch(28, roomNo); } void item_func_BOOMERANG() { - dComIfGs_setItem(SLOT_0, BOOMERANG); + dComIfGs_setItem(SLOT_0, fpcNm_ITEM_BOOMERANG); } void item_func_SPINNER() { - dComIfGs_setItem(SLOT_2, SPINNER); + dComIfGs_setItem(SLOT_2, fpcNm_ITEM_SPINNER); } void item_func_IRONBALL() { - dComIfGs_setItem(SLOT_6, IRONBALL); + dComIfGs_setItem(SLOT_6, fpcNm_ITEM_IRONBALL); } void item_func_BOW() { - dComIfGs_setItem(SLOT_4, BOW); + dComIfGs_setItem(SLOT_4, fpcNm_ITEM_BOW); dComIfGs_setArrowNum(30); dComIfGs_setArrowMax(30); } void item_func_HOOKSHOT() { - dComIfGs_setItem(SLOT_9, HOOKSHOT); + dComIfGs_setItem(SLOT_9, fpcNm_ITEM_HOOKSHOT); } void item_func_HVY_BOOTS() { - dComIfGs_setItem(SLOT_3, HVY_BOOTS); + dComIfGs_setItem(SLOT_3, fpcNm_ITEM_HVY_BOOTS); } void item_func_COPY_ROD() { - dComIfGs_setItem(SLOT_8, COPY_ROD); + dComIfGs_setItem(SLOT_8, fpcNm_ITEM_COPY_ROD); } void item_func_W_HOOKSHOT() { - dComIfGs_setItem(SLOT_9, NO_ITEM); - dComIfGs_setItem(SLOT_10, W_HOOKSHOT); + dComIfGs_setItem(SLOT_9, fpcNm_ITEM_NONE); + dComIfGs_setItem(SLOT_10, fpcNm_ITEM_W_HOOKSHOT); } void item_func_KANTERA() { dComIfGs_setMaxOil(21600); dComIfGs_setOil(21600); - dComIfGs_setItem(SLOT_1, KANTERA); + dComIfGs_setItem(SLOT_1, fpcNm_ITEM_KANTERA); } void item_func_LIGHT_SWORD() { dComIfGs_setCollectSword(COLLECT_LIGHT_SWORD); - dMeter2Info_setSword(LIGHT_SWORD, false); + dMeter2Info_setSword(fpcNm_ITEM_LIGHT_SWORD, false); } void item_func_FISHING_ROD_1() { - dComIfGs_setItem(SLOT_20, FISHING_ROD_1); + dComIfGs_setItem(SLOT_20, fpcNm_ITEM_FISHING_ROD_1); } void item_func_PACHINKO() { u8 pachinko_max = dComIfGs_getPachinkoMax(); dComIfGp_setItemPachinkoNumCount(pachinko_max); - dComIfGs_setItem(SLOT_23, PACHINKO); + dComIfGs_setItem(SLOT_23, fpcNm_ITEM_PACHINKO); } void item_func_COPY_ROD_2() { - dComIfGs_setItem(SLOT_8, COPY_ROD); + dComIfGs_setItem(SLOT_8, fpcNm_ITEM_COPY_ROD); } void item_func_BOMB_BAG_LV2() {} void item_func_BOMB_BAG_LV1() { - dComIfGs_setEmptyBombBag(NORMAL_BOMB, 30); + dComIfGs_setEmptyBombBag(fpcNm_ITEM_NORMAL_BOMB, 30); } void item_func_BOMB_IN_BAG() { - dComIfGs_setEmptyBombBag(NORMAL_BOMB, 30); + dComIfGs_setEmptyBombBag(fpcNm_ITEM_NORMAL_BOMB, 30); } void item_func_LIGHT_ARROW() { - dComIfGs_setItem(SLOT_4, LIGHT_ARROW); + dComIfGs_setItem(SLOT_4, fpcNm_ITEM_LIGHT_ARROW); } void item_func_ARROW_LV1() { @@ -888,55 +888,55 @@ void item_func_EMPTY_BOTTLE() { } void item_func_RED_BOTTLE() { - dComIfGs_setEmptyBottleItemIn(RED_BOTTLE); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_RED_BOTTLE); } void item_func_GREEN_BOTTLE() { - dComIfGs_setEmptyBottleItemIn(GREEN_BOTTLE); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_GREEN_BOTTLE); } void item_func_BLUE_BOTTLE() { - dComIfGs_setEmptyBottleItemIn(BLUE_BOTTLE); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_BLUE_BOTTLE); } void item_func_MILK_BOTTLE() { - dComIfGs_setEmptyBottleItemIn(MILK_BOTTLE); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_MILK_BOTTLE); } void item_func_HALF_MILK_BOTTLE() { - dComIfGs_setEmptyBottle(HALF_MILK_BOTTLE); + dComIfGs_setEmptyBottle(fpcNm_ITEM_HALF_MILK_BOTTLE); } void item_func_OIL_BOTTLE() { - dComIfGs_setEmptyBottleItemIn(OIL_BOTTLE); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_OIL_BOTTLE); } void item_func_WATER_BOTTLE() { - dComIfGs_setEmptyBottleItemIn(WATER_BOTTLE); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_WATER_BOTTLE); } void item_func_OIL_BOTTLE2() { - dComIfGs_setEmptyBottleItemIn(OIL_BOTTLE); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_OIL_BOTTLE); } void item_func_RED_BOTTLE2() { - dComIfGs_setEmptyBottleItemIn(RED_BOTTLE); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_RED_BOTTLE); } void item_func_UGLY_SOUP() { - dComIfGs_setEmptyBottleItemIn(UGLY_SOUP); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_UGLY_SOUP); } void item_func_HOT_SPRING() { - dComIfGs_setEmptyBottleItemIn(HOT_SPRING); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_HOT_SPRING); } void item_func_FAIRY_BOTTLE() { - dComIfGs_setEmptyBottleItemIn(FAIRY); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_FAIRY); } void item_func_HOT_SPRING2() { - dComIfGs_setEmptyBottleItemIn(HOT_SPRING); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_HOT_SPRING); } void item_func_OIL2() {} @@ -944,27 +944,27 @@ void item_func_OIL2() {} void item_func_OIL() {} void item_func_NORMAL_BOMB() { - dComIfGs_setEmptyBombBag(NORMAL_BOMB, 60); + dComIfGs_setEmptyBombBag(fpcNm_ITEM_NORMAL_BOMB, 60); } void item_func_WATER_BOMB() { dComIfGs_setEmptyBombBag(); - dComIfGs_setEmptyBombBagItemIn(WATER_BOMB, true); + dComIfGs_setEmptyBombBagItemIn(fpcNm_ITEM_WATER_BOMB, true); } void item_func_POKE_BOMB() { dComIfGs_setEmptyBombBag(); - dComIfGs_setEmptyBombBagItemIn(POKE_BOMB, true); + dComIfGs_setEmptyBombBagItemIn(fpcNm_ITEM_POKE_BOMB, true); } void item_func_FAIRY_DROP() { - dComIfGs_setEmptyBottleItemIn(FAIRY_DROP); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_FAIRY_DROP); } void item_func_WORM() {} void item_func_DROP_BOTTLE() { - dComIfGs_setEmptyBottle(FAIRY_DROP); + dComIfGs_setEmptyBottle(fpcNm_ITEM_FAIRY_DROP); } void item_func_BEE_CHILD() { @@ -974,7 +974,7 @@ void item_func_BEE_CHILD() { for (bottleIdx = 0xFF, i = 0; i < 4; i++) { u8 getItem = dComIfGs_getItem(i + SLOT_11, true); - if (getItem == EMPTY_BOTTLE) { + if (getItem == fpcNm_ITEM_EMPTY_BOTTLE) { bottleIdx = i; break; } @@ -982,81 +982,81 @@ void item_func_BEE_CHILD() { if (bottleIdx != 0xff) { dComIfGs_setBottleNum(bottleIdx, 10); - dComIfGs_setEmptyBottleItemIn(BEE_CHILD); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_BEE_CHILD); } } void item_func_CHUCHU_RARE() { - dComIfGs_setEmptyBottleItemIn(CHUCHU_RARE); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_CHUCHU_RARE); } void item_func_CHUCHU_RED() { - dComIfGs_setEmptyBottleItemIn(CHUCHU_RED); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_CHUCHU_RED); } void item_func_CHUCHU_BLUE() { - dComIfGs_setEmptyBottleItemIn(CHUCHU_BLUE); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_CHUCHU_BLUE); } void item_func_CHUCHU_GREEN() { - dComIfGs_setEmptyBottleItemIn(CHUCHU_GREEN); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_CHUCHU_GREEN); } void item_func_CHUCHU_YELLOW() { - dComIfGs_setEmptyBottleItemIn(CHUCHU_YELLOW); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_CHUCHU_YELLOW); } void item_func_CHUCHU_PURPLE() { - dComIfGs_setEmptyBottleItemIn(CHUCHU_PURPLE); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_CHUCHU_PURPLE); } void item_func_LV1_SOUP() { - dComIfGs_setEmptyBottleItemIn(LV1_SOUP); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_LV1_SOUP); } void item_func_LV2_SOUP() { - dComIfGs_setEmptyBottleItemIn(LV2_SOUP); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_LV2_SOUP); } void item_func_LV3_SOUP() { - dComIfGs_setEmptyBottleItemIn(LV3_SOUP); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_LV3_SOUP); } void item_func_LETTER() { - dComIfGs_setItem(SLOT_21, LETTER); + dComIfGs_setItem(SLOT_21, fpcNm_ITEM_LETTER); } void item_func_BILL() { - dComIfGs_setItem(SLOT_21, BILL); + dComIfGs_setItem(SLOT_21, fpcNm_ITEM_BILL); } void item_func_WOOD_STATUE() { dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[283]); - dComIfGs_setItem(SLOT_21, WOOD_STATUE); + dComIfGs_setItem(SLOT_21, fpcNm_ITEM_WOOD_STATUE); } void item_func_IRIAS_PENDANT() { - dComIfGs_setItem(SLOT_21, IRIAS_PENDANT); + dComIfGs_setItem(SLOT_21, fpcNm_ITEM_IRIAS_PENDANT); } void item_func_HORSE_FLUTE() { - dComIfGs_setItem(SLOT_21, HORSE_FLUTE); + dComIfGs_setItem(SLOT_21, fpcNm_ITEM_HORSE_FLUTE); } void item_func_RAFRELS_MEMO() { - dComIfGs_setItem(SLOT_19, RAFRELS_MEMO); + dComIfGs_setItem(SLOT_19, fpcNm_ITEM_RAFRELS_MEMO); } void item_func_ASHS_SCRIBBLING() { - dComIfGs_setItem(SLOT_19, ASHS_SCRIBBLING); + dComIfGs_setItem(SLOT_19, fpcNm_ITEM_ASHS_SCRIBBLING); } void item_func_CHUCHU_YELLOW2() { - dComIfGs_setEmptyBottleItemIn(CHUCHU_YELLOW); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_CHUCHU_YELLOW); } void item_func_OIL_BOTTLE3() { - dComIfGs_setEmptyBottle(OIL_BOTTLE); + dComIfGs_setEmptyBottle(fpcNm_ITEM_OIL_BOTTLE); } void item_func_SHOP_BEE_CHILD() { @@ -1064,7 +1064,7 @@ void item_func_SHOP_BEE_CHILD() { } void item_func_CHUCHU_BLACK() { - dComIfGs_setEmptyBottleItemIn(CHUCHU_BLACK); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_CHUCHU_BLACK); } void item_func_LIGHT_DROP() {} @@ -1152,19 +1152,19 @@ void item_func_F_MAYFLY() {} void item_func_POU_SPIRIT() {} void item_func_ANCIENT_DOCUMENT() { - dComIfGs_setItem(SLOT_22, ANCIENT_DOCUMENT); + dComIfGs_setItem(SLOT_22, fpcNm_ITEM_ANCIENT_DOCUMENT); } void item_func_AIR_LETTER() { - dComIfGs_setItem(SLOT_22, AIR_LETTER); + dComIfGs_setItem(SLOT_22, fpcNm_ITEM_AIR_LETTER); } void item_func_ANCIENT_DOCUMENT2() { - dComIfGs_setItem(SLOT_22, ANCIENT_DOCUMENT2); + dComIfGs_setItem(SLOT_22, fpcNm_ITEM_ANCIENT_DOCUMENT2); } void item_func_LV7_DUNGEON_EXIT() { - dComIfGs_setItem(SLOT_18, LV7_DUNGEON_EXIT); + dComIfGs_setItem(SLOT_18, fpcNm_ITEM_LV7_DUNGEON_EXIT); } void item_func_LINKS_SAVINGS() { @@ -1224,31 +1224,31 @@ int item_getcheck_func_HEART() { } int item_getcheck_func_GREEN_RUPEE() { - return dComIfGs_isItemFirstBit(GREEN_RUPEE); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_GREEN_RUPEE); } int item_getcheck_func_BLUE_RUPEE() { - return dComIfGs_isItemFirstBit(BLUE_RUPEE); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_BLUE_RUPEE); } int item_getcheck_func_YELLOW_RUPEE() { - return dComIfGs_isItemFirstBit(YELLOW_RUPEE); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_YELLOW_RUPEE); } int item_getcheck_func_RED_RUPEE() { - return dComIfGs_isItemFirstBit(RED_RUPEE); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_RED_RUPEE); } int item_getcheck_func_PURPLE_RUPEE() { - return dComIfGs_isItemFirstBit(PURPLE_RUPEE); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_PURPLE_RUPEE); } int item_getcheck_func_ORANGE_RUPEE() { - return dComIfGs_isItemFirstBit(ORANGE_RUPEE); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_ORANGE_RUPEE); } int item_getcheck_func_SILVER_RUPEE() { - return dComIfGs_isItemFirstBit(SILVER_RUPEE); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_SILVER_RUPEE); } int item_getcheck_func_S_MAGIC() { @@ -1260,39 +1260,39 @@ int item_getcheck_func_L_MAGIC() { } int item_getcheck_func_BOMB_5() { - return dComIfGs_isItemFirstBit(BOMB_5); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_5); } int item_getcheck_func_BOMB_10() { - return dComIfGs_isItemFirstBit(BOMB_10); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_10); } int item_getcheck_func_BOMB_20() { - return dComIfGs_isItemFirstBit(BOMB_20); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_20); } int item_getcheck_func_BOMB_30() { - return dComIfGs_isItemFirstBit(BOMB_30); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_30); } int item_getcheck_func_ARROW_10() { - return dComIfGs_isItemFirstBit(ARROW_10); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_ARROW_10); } int item_getcheck_func_ARROW_20() { - return dComIfGs_isItemFirstBit(ARROW_20); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_ARROW_20); } int item_getcheck_func_ARROW_30() { - return dComIfGs_isItemFirstBit(ARROW_30); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_ARROW_30); } int item_getcheck_func_ARROW_1() { - return dComIfGs_isItemFirstBit(ARROW_1); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_ARROW_1); } int item_getcheck_func_PACHINKO_SHOT() { - return dComIfGs_isItemFirstBit(PACHINKO_SHOT); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_PACHINKO_SHOT); } int item_getcheck_func_WATER_BOMB_5() { @@ -1316,15 +1316,15 @@ int item_getcheck_func_BOMB_INSECT_5() { } int item_getcheck_func_BOMB_INSECT_10() { - return dComIfGs_isItemFirstBit(BOMB_INSECT_10); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_INSECT_10); } int item_getcheck_func_BOMB_INSECT_20() { - return dComIfGs_isItemFirstBit(BOMB_INSECT_20); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_INSECT_20); } int item_getcheck_func_BOMB_INSECT_30() { - return dComIfGs_isItemFirstBit(BOMB_INSECT_30); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_INSECT_30); } int item_getcheck_func_RECOVER_FAILY() { @@ -1356,7 +1356,7 @@ int item_getcheck_func_COMPUS() { } int item_getcheck_func_DUNGEON_EXIT() { - return dComIfGs_getItem(SLOT_18, true) == DUNGEON_EXIT ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_18, true) == fpcNm_ITEM_DUNGEON_EXIT ? TRUE : FALSE; } int item_getcheck_func_BOSS_KEY() { @@ -1364,7 +1364,7 @@ int item_getcheck_func_BOSS_KEY() { } int item_getcheck_func_DUNGEON_BACK() { - return dComIfGs_getItem(SLOT_18, true) == DUNGEON_BACK ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_18, true) == fpcNm_ITEM_DUNGEON_BACK ? TRUE : FALSE; } int item_getcheck_func_SWORD() { @@ -1376,23 +1376,23 @@ int item_getcheck_func_MASTER_SWORD() { } int item_getcheck_func_WOOD_SHIELD() { - return dComIfGs_isItemFirstBit(WOOD_SHIELD); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_WOOD_SHIELD); } int item_getcheck_func_SHIELD() { - return dComIfGs_isItemFirstBit(SHIELD); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_SHIELD); } int item_getcheck_func_HYLIA_SHIELD() { - return dComIfGs_isItemFirstBit(HYLIA_SHIELD); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_HYLIA_SHIELD); } int item_getcheck_func_TKS_LETTER() { - return dComIfGs_getItem(SLOT_18, true) == TKS_LETTER ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_18, true) == fpcNm_ITEM_TKS_LETTER ? TRUE : FALSE; } int item_getcheck_func_WEAR_CASUAL() { - return dComIfGs_isItemFirstBit(WEAR_CASUAL); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_WEAR_CASUAL); } int item_getcheck_func_WEAR_KOKIRI() { @@ -1400,11 +1400,11 @@ int item_getcheck_func_WEAR_KOKIRI() { } int item_getcheck_func_ARMOR() { - return dComIfGs_isItemFirstBit(ARMOR); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_ARMOR); } int item_getcheck_func_WEAR_ZORA() { - return dComIfGs_isItemFirstBit(WEAR_ZORA); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_WEAR_ZORA); } int item_getcheck_func_MAGIC_LV1() { @@ -1412,7 +1412,7 @@ int item_getcheck_func_MAGIC_LV1() { } int item_getcheck_func_DUNGEON_EXIT_2() { - return dComIfGs_getItem(SLOT_18, true) == DUNGEON_EXIT ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_18, true) == fpcNm_ITEM_DUNGEON_EXIT ? TRUE : FALSE; } int item_getcheck_func_WALLET_LV1() { @@ -1428,51 +1428,51 @@ int item_getcheck_func_WALLET_LV3() { } int item_getcheck_func_ZORAS_JEWEL() { - return dComIfGs_getItem(SLOT_20, true) == ZORAS_JEWEL ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_20, true) == fpcNm_ITEM_ZORAS_JEWEL ? TRUE : FALSE; } int item_getcheck_func_HAWK_EYE() { - return dComIfGs_isItemFirstBit(HAWK_EYE); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_HAWK_EYE); } int item_getcheck_func_WOOD_STICK() { - return dComIfGs_isItemFirstBit(WOOD_STICK); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_WOOD_STICK); } int item_getcheck_func_BOOMERANG() { - return dComIfGs_getItem(SLOT_0, true) == BOOMERANG ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_0, true) == fpcNm_ITEM_BOOMERANG ? TRUE : FALSE; } int item_getcheck_func_SPINNER() { - return dComIfGs_getItem(SLOT_2, true) == SPINNER ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_2, true) == fpcNm_ITEM_SPINNER ? TRUE : FALSE; } int item_getcheck_func_IRONBALL() { - return dComIfGs_getItem(SLOT_6, true) == IRONBALL ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_6, true) == fpcNm_ITEM_IRONBALL ? TRUE : FALSE; } int item_getcheck_func_BOW() { - return dComIfGs_getItem(SLOT_4, false) == BOW ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_4, false) == fpcNm_ITEM_BOW ? TRUE : FALSE; } int item_getcheck_func_HOOKSHOT() { - return dComIfGs_getItem(SLOT_9, true) == HOOKSHOT ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_9, true) == fpcNm_ITEM_HOOKSHOT ? TRUE : FALSE; } int item_getcheck_func_HVY_BOOTS() { - return dComIfGs_getItem(SLOT_3, true) == HVY_BOOTS ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_3, true) == fpcNm_ITEM_HVY_BOOTS ? TRUE : FALSE; } int item_getcheck_func_COPY_ROD() { - return dComIfGs_getItem(SLOT_8, true) == COPY_ROD ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_8, true) == fpcNm_ITEM_COPY_ROD ? TRUE : FALSE; } int item_getcheck_func_W_HOOKSHOT() { - return dComIfGs_getItem(SLOT_10, true) == W_HOOKSHOT ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_10, true) == fpcNm_ITEM_W_HOOKSHOT ? TRUE : FALSE; } int item_getcheck_func_KANTERA() { - return dComIfGs_getItem(SLOT_1, true) == KANTERA ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_1, true) == fpcNm_ITEM_KANTERA ? TRUE : FALSE; } int item_getcheck_func_LIGHT_SWORD() { @@ -1481,18 +1481,18 @@ int item_getcheck_func_LIGHT_SWORD() { /* 8009A0C8-8009A1FC 094A08 0134+00 7/6 0/0 0/0 .text item_getcheck_func_FISHING_ROD_1__Fv */ int item_getcheck_func_FISHING_ROD_1() { - return (dComIfGs_getItem(SLOT_20, true) == FISHING_ROD_1 || - dComIfGs_getItem(SLOT_20, true) == BEE_ROD || - dComIfGs_getItem(SLOT_20, true) == WORM_ROD || - dComIfGs_getItem(SLOT_20, true) == JEWEL_ROD || - dComIfGs_getItem(SLOT_20, true) == JEWEL_BEE_ROD || - dComIfGs_getItem(SLOT_20, true) == JEWEL_WORM_ROD) ? + return (dComIfGs_getItem(SLOT_20, true) == fpcNm_ITEM_FISHING_ROD_1 || + dComIfGs_getItem(SLOT_20, true) == fpcNm_ITEM_BEE_ROD || + dComIfGs_getItem(SLOT_20, true) == fpcNm_ITEM_WORM_ROD || + dComIfGs_getItem(SLOT_20, true) == fpcNm_ITEM_JEWEL_ROD || + dComIfGs_getItem(SLOT_20, true) == fpcNm_ITEM_JEWEL_BEE_ROD || + dComIfGs_getItem(SLOT_20, true) == fpcNm_ITEM_JEWEL_WORM_ROD) ? TRUE : FALSE; } int item_getcheck_func_PACHINKO() { - return dComIfGs_getItem(SLOT_23, true) == PACHINKO ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_23, true) == fpcNm_ITEM_PACHINKO ? TRUE : FALSE; } int item_getcheck_func_COPY_ROD_2() { @@ -1500,31 +1500,31 @@ int item_getcheck_func_COPY_ROD_2() { } int item_getcheck_func_BOMB_BAG_LV2() { - return dComIfGs_isItemFirstBit(BOMB_BAG_LV2); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_BAG_LV2); } int item_getcheck_func_BOMB_BAG_LV1() { - return dComIfGs_isItemFirstBit(BOMB_BAG_LV1); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_BAG_LV1); } int item_getcheck_func_BOMB_IN_BAG() { - return dComIfGs_isItemFirstBit(BOMB_IN_BAG); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_IN_BAG); } int item_getcheck_func_LIGHT_ARROW() { - return dComIfGs_isItemFirstBit(LIGHT_ARROW); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_LIGHT_ARROW); } int item_getcheck_func_ARROW_LV1() { - return (dComIfGs_getItem(SLOT_4, false) == BOW && dComIfGs_getArrowMax() >= 30) ? TRUE : FALSE; + return (dComIfGs_getItem(SLOT_4, false) == fpcNm_ITEM_BOW && dComIfGs_getArrowMax() >= 30) ? TRUE : FALSE; } int item_getcheck_func_ARROW_LV2() { - return (dComIfGs_getItem(SLOT_4, false) == BOW && dComIfGs_getArrowMax() >= 60) ? TRUE : FALSE; + return (dComIfGs_getItem(SLOT_4, false) == fpcNm_ITEM_BOW && dComIfGs_getArrowMax() >= 60) ? TRUE : FALSE; } int item_getcheck_func_ARROW_LV3() { - return (dComIfGs_getItem(SLOT_4, false) == BOW && dComIfGs_getArrowMax() >= 100) ? TRUE : FALSE; + return (dComIfGs_getItem(SLOT_4, false) == fpcNm_ITEM_BOW && dComIfGs_getArrowMax() >= 100) ? TRUE : FALSE; } int item_getcheck_func_LURE_ROD() { @@ -1560,91 +1560,91 @@ int item_getcheck_func_JEWEL_WORM_ROD() { } int item_getcheck_func_EMPTY_BOTTLE() { - return dComIfGs_checkBottle(EMPTY_BOTTLE); + return dComIfGs_checkBottle(fpcNm_ITEM_EMPTY_BOTTLE); } int item_getcheck_func_RED_BOTTLE() { - return dComIfGs_checkBottle(RED_BOTTLE); + return dComIfGs_checkBottle(fpcNm_ITEM_RED_BOTTLE); } int item_getcheck_func_GREEN_BOTTLE() { - return dComIfGs_checkBottle(GREEN_BOTTLE); + return dComIfGs_checkBottle(fpcNm_ITEM_GREEN_BOTTLE); } int item_getcheck_func_BLUE_BOTTLE() { - return dComIfGs_checkBottle(BLUE_BOTTLE); + return dComIfGs_checkBottle(fpcNm_ITEM_BLUE_BOTTLE); } int item_getcheck_func_MILK_BOTTLE() { - return dComIfGs_checkBottle(MILK_BOTTLE); + return dComIfGs_checkBottle(fpcNm_ITEM_MILK_BOTTLE); } int item_getcheck_func_HALF_MILK_BOTTLE() { - return dComIfGs_checkBottle(HALF_MILK_BOTTLE); + return dComIfGs_checkBottle(fpcNm_ITEM_HALF_MILK_BOTTLE); } int item_getcheck_func_OIL_BOTTLE() { - return dComIfGs_checkBottle(OIL_BOTTLE); + return dComIfGs_checkBottle(fpcNm_ITEM_OIL_BOTTLE); } int item_getcheck_func_WATER_BOTTLE() { - return dComIfGs_checkBottle(WATER_BOTTLE); + return dComIfGs_checkBottle(fpcNm_ITEM_WATER_BOTTLE); } int item_getcheck_func_OIL_BOTTLE2() { - return dComIfGs_checkBottle(OIL_BOTTLE_2); + return dComIfGs_checkBottle(fpcNm_ITEM_OIL_BOTTLE_2); } int item_getcheck_func_RED_BOTTLE2() { - return dComIfGs_checkBottle(RED_BOTTLE_2); + return dComIfGs_checkBottle(fpcNm_ITEM_RED_BOTTLE_2); } int item_getcheck_func_UGLY_SOUP() { - return dComIfGs_checkBottle(UGLY_SOUP); + return dComIfGs_checkBottle(fpcNm_ITEM_UGLY_SOUP); } int item_getcheck_func_HOT_SPRING() { - return dComIfGs_checkBottle(HOT_SPRING); + return dComIfGs_checkBottle(fpcNm_ITEM_HOT_SPRING); } int item_getcheck_func_FAIRY_BOTTLE() { - return dComIfGs_checkBottle(FAIRY); + return dComIfGs_checkBottle(fpcNm_ITEM_FAIRY); } int item_getcheck_func_HOT_SPRING2() { - return dComIfGs_checkBottle(HOT_SPRING); + return dComIfGs_checkBottle(fpcNm_ITEM_HOT_SPRING); } int item_getcheck_func_OIL2() { - return dComIfGs_checkBottle(OIL2); + return dComIfGs_checkBottle(fpcNm_ITEM_OIL2); } int item_getcheck_func_OIL() { - return dComIfGs_checkBottle(OIL); + return dComIfGs_checkBottle(fpcNm_ITEM_OIL); } int item_getcheck_func_NORMAL_BOMB() { - return dComIfGs_isItemFirstBit(NORMAL_BOMB); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_NORMAL_BOMB); } int item_getcheck_func_WATER_BOMB() { - return dComIfGs_isItemFirstBit(WATER_BOMB); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_WATER_BOMB); } int item_getcheck_func_POKE_BOMB() { - return dComIfGs_isItemFirstBit(POKE_BOMB); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_POKE_BOMB); } int item_getcheck_func_FAIRY_DROP() { - return dComIfGs_checkBottle(FAIRY_DROP); + return dComIfGs_checkBottle(fpcNm_ITEM_FAIRY_DROP); } int item_getcheck_func_WORM() { - return dComIfGs_checkBottle(WORM); + return dComIfGs_checkBottle(fpcNm_ITEM_WORM); } int item_getcheck_func_DROP_BOTTLE() { - return dComIfGs_isItemFirstBit(DROP_BOTTLE); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_DROP_BOTTLE); } int item_getcheck_func_BEE_CHILD() { @@ -1652,71 +1652,71 @@ int item_getcheck_func_BEE_CHILD() { } int item_getcheck_func_CHUCHU_RARE() { - return dComIfGs_checkBottle(CHUCHU_RARE); + return dComIfGs_checkBottle(fpcNm_ITEM_CHUCHU_RARE); } int item_getcheck_func_CHUCHU_RED() { - return dComIfGs_checkBottle(CHUCHU_RED); + return dComIfGs_checkBottle(fpcNm_ITEM_CHUCHU_RED); } int item_getcheck_func_CHUCHU_BLUE() { - return dComIfGs_checkBottle(CHUCHU_BLUE); + return dComIfGs_checkBottle(fpcNm_ITEM_CHUCHU_BLUE); } int item_getcheck_func_CHUCHU_GREEN() { - return dComIfGs_checkBottle(CHUCHU_GREEN); + return dComIfGs_checkBottle(fpcNm_ITEM_CHUCHU_GREEN); } int item_getcheck_func_CHUCHU_YELLOW() { - return dComIfGs_checkBottle(CHUCHU_YELLOW); + return dComIfGs_checkBottle(fpcNm_ITEM_CHUCHU_YELLOW); } int item_getcheck_func_CHUCHU_PURPLE() { - return dComIfGs_checkBottle(CHUCHU_PURPLE); + return dComIfGs_checkBottle(fpcNm_ITEM_CHUCHU_PURPLE); } int item_getcheck_func_LV1_SOUP() { - return dComIfGs_isItemFirstBit(LV1_SOUP); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_LV1_SOUP); } int item_getcheck_func_LV2_SOUP() { - return dComIfGs_isItemFirstBit(LV2_SOUP); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_LV2_SOUP); } int item_getcheck_func_LV3_SOUP() { - return dComIfGs_isItemFirstBit(LV3_SOUP); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_LV3_SOUP); } int item_getcheck_func_LETTER() { - return dComIfGs_getItem(SLOT_21, true) == LETTER ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_21, true) == fpcNm_ITEM_LETTER ? TRUE : FALSE; } int item_getcheck_func_BILL() { - return dComIfGs_getItem(SLOT_21, true) == BILL ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_21, true) == fpcNm_ITEM_BILL ? TRUE : FALSE; } int item_getcheck_func_WOOD_STATUE() { - return dComIfGs_getItem(SLOT_21, true) == WOOD_STATUE ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_21, true) == fpcNm_ITEM_WOOD_STATUE ? TRUE : FALSE; } int item_getcheck_func_IRIAS_PENDANT() { - return dComIfGs_getItem(SLOT_21, true) == IRIAS_PENDANT ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_21, true) == fpcNm_ITEM_IRIAS_PENDANT ? TRUE : FALSE; } int item_getcheck_func_HORSE_FLUTE() { - return dComIfGs_getItem(SLOT_22, true) == HORSE_FLUTE ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_22, true) == fpcNm_ITEM_HORSE_FLUTE ? TRUE : FALSE; } int item_getcheck_func_RAFRELS_MEMO() { - return dComIfGs_getItem(SLOT_19, true) == RAFRELS_MEMO ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_19, true) == fpcNm_ITEM_RAFRELS_MEMO ? TRUE : FALSE; } int item_getcheck_func_ASHS_SCRIBBLING() { - return dComIfGs_getItem(SLOT_19, true) == ASHS_SCRIBBLING ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_19, true) == fpcNm_ITEM_ASHS_SCRIBBLING ? TRUE : FALSE; } int item_getcheck_func_CHUCHU_YELLOW2() { - return dComIfGs_checkBottle(CHUCHU_YELLOW2); + return dComIfGs_checkBottle(fpcNm_ITEM_CHUCHU_YELLOW2); } int item_getcheck_func_OIL_BOTTLE3() { @@ -1728,11 +1728,11 @@ int item_getcheck_func_SHOP_BEE_CHILD() { } int item_getcheck_func_CHUCHU_BLACK() { - return dComIfGs_checkBottle(CHUCHU_BLACK); + return dComIfGs_checkBottle(fpcNm_ITEM_CHUCHU_BLACK); } int item_getcheck_func_LIGHT_DROP() { - return dComIfGs_isItemFirstBit(LIGHT_DROP); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_LIGHT_DROP); } int item_getcheck_func_DROP_CONTAINER() { @@ -1764,7 +1764,7 @@ int item_getcheck_func_MIRROR_PIECE_4() { } int item_getcheck_func_SMELL_YELIA_POUCH() { - return dComIfGs_getCollectSmell() == SMELL_YELIA_POUCH ? TRUE : FALSE; + return dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_YELIA_POUCH ? TRUE : FALSE; } int item_getcheck_func_SMELL_PUMPKIN() { @@ -1772,115 +1772,115 @@ int item_getcheck_func_SMELL_PUMPKIN() { } int item_getcheck_func_SMELL_POH() { - return dComIfGs_getCollectSmell() == SMELL_POH ? TRUE : FALSE; + return dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_POH ? TRUE : FALSE; } int item_getcheck_func_SMELL_FISH() { - return dComIfGs_getCollectSmell() == SMELL_FISH ? TRUE : FALSE; + return dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_FISH ? TRUE : FALSE; } int item_getcheck_func_SMELL_CHILDREN() { - return dComIfGs_getCollectSmell() == SMELL_CHILDREN ? TRUE : FALSE; + return dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_CHILDREN ? TRUE : FALSE; } int item_getcheck_func_SMELL_MEDICINE() { - return dComIfGs_getCollectSmell() == SMELL_MEDICINE ? TRUE : FALSE; + return dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_MEDICINE ? TRUE : FALSE; } int item_getcheck_func_M_BEETLE() { - return dComIfGs_isItemFirstBit(M_BEETLE); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_BEETLE); } int item_getcheck_func_F_BEETLE() { - return dComIfGs_isItemFirstBit(F_BEETLE); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_BEETLE); } int item_getcheck_func_M_BUTTERFLY() { - return dComIfGs_isItemFirstBit(M_BUTTERFLY); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_BUTTERFLY); } int item_getcheck_func_F_BUTTERFLY() { - return dComIfGs_isItemFirstBit(F_BUTTERFLY); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_BUTTERFLY); } int item_getcheck_func_M_STAG_BEETLE() { - return dComIfGs_isItemFirstBit(M_STAG_BEETLE); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_STAG_BEETLE); } int item_getcheck_func_F_STAG_BEETLE() { - return dComIfGs_isItemFirstBit(F_STAG_BEETLE); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_STAG_BEETLE); } int item_getcheck_func_M_GRASSHOPPER() { - return dComIfGs_isItemFirstBit(M_GRASSHOPPER); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_GRASSHOPPER); } int item_getcheck_func_F_GRASSHOPPER() { - return dComIfGs_isItemFirstBit(F_GRASSHOPPER); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_GRASSHOPPER); } int item_getcheck_func_M_NANAFUSHI() { - return dComIfGs_isItemFirstBit(M_NANAFUSHI); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_NANAFUSHI); } int item_getcheck_func_F_NANAFUSHI() { - return dComIfGs_isItemFirstBit(F_NANAFUSHI); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_NANAFUSHI); } int item_getcheck_func_M_DANGOMUSHI() { - return dComIfGs_isItemFirstBit(M_DANGOMUSHI); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_DANGOMUSHI); } int item_getcheck_func_F_DANGOMUSHI() { - return dComIfGs_isItemFirstBit(F_DANGOMUSHI); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_DANGOMUSHI); } int item_getcheck_func_M_MANTIS() { - return dComIfGs_isItemFirstBit(M_MANTIS); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_MANTIS); } int item_getcheck_func_F_MANTIS() { - return dComIfGs_isItemFirstBit(F_MANTIS); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_MANTIS); } int item_getcheck_func_M_LADYBUG() { - return dComIfGs_isItemFirstBit(M_LADYBUG); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_LADYBUG); } int item_getcheck_func_F_LADYBUG() { - return dComIfGs_isItemFirstBit(F_LADYBUG); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_LADYBUG); } int item_getcheck_func_M_SNAIL() { - return dComIfGs_isItemFirstBit(M_SNAIL); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_SNAIL); } int item_getcheck_func_F_SNAIL() { - return dComIfGs_isItemFirstBit(F_SNAIL); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_SNAIL); } int item_getcheck_func_M_DRAGONFLY() { - return dComIfGs_isItemFirstBit(M_DRAGONFLY); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_DRAGONFLY); } int item_getcheck_func_F_DRAGONFLY() { - return dComIfGs_isItemFirstBit(F_DRAGONFLY); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_DRAGONFLY); } int item_getcheck_func_M_ANT() { - return dComIfGs_isItemFirstBit(M_ANT); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_ANT); } int item_getcheck_func_F_ANT() { - return dComIfGs_isItemFirstBit(F_ANT); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_ANT); } int item_getcheck_func_M_MAYFLY() { - return dComIfGs_isItemFirstBit(M_MAYFLY); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_MAYFLY); } int item_getcheck_func_F_MAYFLY() { - return dComIfGs_isItemFirstBit(F_MAYFLY); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_MAYFLY); } int item_getcheck_func_POU_SPIRIT() { @@ -1888,19 +1888,19 @@ int item_getcheck_func_POU_SPIRIT() { } int item_getcheck_func_ANCIENT_DOCUMENT() { - return dComIfGs_getItem(SLOT_22, true) == ANCIENT_DOCUMENT ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_22, true) == fpcNm_ITEM_ANCIENT_DOCUMENT ? TRUE : FALSE; } int item_getcheck_func_AIR_LETTER() { - return dComIfGs_getItem(SLOT_22, true) == AIR_LETTER ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_22, true) == fpcNm_ITEM_AIR_LETTER ? TRUE : FALSE; } int item_getcheck_func_ANCIENT_DOCUMENT2() { - return dComIfGs_getItem(SLOT_22, true) == ANCIENT_DOCUMENT2 ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_22, true) == fpcNm_ITEM_ANCIENT_DOCUMENT2 ? TRUE : FALSE; } int item_getcheck_func_LV7_DUNGEON_EXIT() { - return dComIfGs_getItem(SLOT_18, true) == LV7_DUNGEON_EXIT ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_18, true) == fpcNm_ITEM_LV7_DUNGEON_EXIT ? TRUE : FALSE; } int item_getcheck_func_LINKS_SAVINGS() { @@ -1932,11 +1932,11 @@ int item_getcheck_func_BOSSRIDER_KEY() { } int item_getcheck_func_TOMATO_PUREE() { - return dComIfGs_isItemFirstBit(TOMATO_PUREE); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_TOMATO_PUREE); } int item_getcheck_func_TASTE() { - return dComIfGs_isItemFirstBit(TASTE); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_TASTE); } int item_getcheck_func_LV5_BOSS_KEY() { @@ -1952,19 +1952,19 @@ int item_getcheck_func_KANTERA2() { } int item_getcheck_func_L2_KEY_PIECES1() { - return dComIfGs_isItemFirstBit(L2_KEY_PIECES1); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_L2_KEY_PIECES1); } int item_getcheck_func_L2_KEY_PIECES2() { - return dComIfGs_isItemFirstBit(L2_KEY_PIECES2); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_L2_KEY_PIECES2); } int item_getcheck_func_L2_KEY_PIECES3() { - return dComIfGs_isItemFirstBit(L2_KEY_PIECES3); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_L2_KEY_PIECES3); } int item_getcheck_func_KEY_OF_CARAVAN() { - return dComIfGs_isItemFirstBit(KEY_OF_CARAVAN); + return dComIfGs_isItemFirstBit(fpcNm_ITEM_KEY_OF_CARAVAN); } int item_getcheck_func_LV2_BOSS_KEY() { @@ -1978,8 +1978,8 @@ int item_getcheck_func_KEY_OF_FILONE() { int isBomb(u8 i_itemNo) { int is_bomb = false; - if (i_itemNo == BOMB_5 || i_itemNo == BOMB_10 || i_itemNo == BOMB_20 || i_itemNo == BOMB_30 || - i_itemNo == NORMAL_BOMB | i_itemNo == WATER_BOMB || i_itemNo == POKE_BOMB) + if (i_itemNo == fpcNm_ITEM_BOMB_5 || i_itemNo == fpcNm_ITEM_BOMB_10 || i_itemNo == fpcNm_ITEM_BOMB_20 || i_itemNo == fpcNm_ITEM_BOMB_30 || + i_itemNo == fpcNm_ITEM_NORMAL_BOMB | i_itemNo == fpcNm_ITEM_WATER_BOMB || i_itemNo == fpcNm_ITEM_POKE_BOMB) { is_bomb = true; } @@ -1990,7 +1990,7 @@ int isBomb(u8 i_itemNo) { int isArrow(u8 i_itemNo) { int is_arrow = false; - if (i_itemNo == ARROW_1 || i_itemNo == ARROW_10 || i_itemNo == ARROW_20 || i_itemNo == ARROW_30) + if (i_itemNo == fpcNm_ITEM_ARROW_1 || i_itemNo == fpcNm_ITEM_ARROW_10 || i_itemNo == fpcNm_ITEM_ARROW_20 || i_itemNo == fpcNm_ITEM_ARROW_30) { is_arrow = true; } @@ -2001,37 +2001,37 @@ int isArrow(u8 i_itemNo) { /* 8009B708-8009B77C 096048 0074+00 0/0 4/4 1/1 .text isBottleItem__FUc */ BOOL isBottleItem(u8 i_itemNo) { switch (i_itemNo) { - case OIL_BOTTLE3: - case EMPTY_BOTTLE: - case RED_BOTTLE: - case GREEN_BOTTLE: - case BLUE_BOTTLE: - case MILK_BOTTLE: - case HALF_MILK_BOTTLE: - case OIL_BOTTLE: - case WATER_BOTTLE: - case OIL_BOTTLE_2: - case RED_BOTTLE_2: - case UGLY_SOUP: - case HOT_SPRING: - case FAIRY: - case FAIRY_DROP: - case WORM: - case BEE_CHILD: - case CHUCHU_RARE: - case CHUCHU_RED: - case CHUCHU_BLUE: - case CHUCHU_GREEN: - case CHUCHU_YELLOW: - case CHUCHU_PURPLE: - case LV1_SOUP: - case LV2_SOUP: - case LV3_SOUP: - case CHUCHU_BLACK: - case POU_FIRE1: - case POU_FIRE2: - case POU_FIRE3: - case POU_FIRE4: + case fpcNm_ITEM_OIL_BOTTLE3: + case fpcNm_ITEM_EMPTY_BOTTLE: + case fpcNm_ITEM_RED_BOTTLE: + case fpcNm_ITEM_GREEN_BOTTLE: + case fpcNm_ITEM_BLUE_BOTTLE: + case fpcNm_ITEM_MILK_BOTTLE: + case fpcNm_ITEM_HALF_MILK_BOTTLE: + case fpcNm_ITEM_OIL_BOTTLE: + case fpcNm_ITEM_WATER_BOTTLE: + case fpcNm_ITEM_OIL_BOTTLE_2: + case fpcNm_ITEM_RED_BOTTLE_2: + case fpcNm_ITEM_UGLY_SOUP: + case fpcNm_ITEM_HOT_SPRING: + case fpcNm_ITEM_FAIRY: + case fpcNm_ITEM_FAIRY_DROP: + case fpcNm_ITEM_WORM: + case fpcNm_ITEM_BEE_CHILD: + case fpcNm_ITEM_CHUCHU_RARE: + case fpcNm_ITEM_CHUCHU_RED: + case fpcNm_ITEM_CHUCHU_BLUE: + case fpcNm_ITEM_CHUCHU_GREEN: + case fpcNm_ITEM_CHUCHU_YELLOW: + case fpcNm_ITEM_CHUCHU_PURPLE: + case fpcNm_ITEM_LV1_SOUP: + case fpcNm_ITEM_LV2_SOUP: + case fpcNm_ITEM_LV3_SOUP: + case fpcNm_ITEM_CHUCHU_BLACK: + case fpcNm_ITEM_POU_FIRE1: + case fpcNm_ITEM_POU_FIRE2: + case fpcNm_ITEM_POU_FIRE3: + case fpcNm_ITEM_POU_FIRE4: return TRUE; default: return FALSE; @@ -2041,7 +2041,7 @@ BOOL isBottleItem(u8 i_itemNo) { BOOL isHeart(u8 i_itemNo) { BOOL is_heart = false; - if (i_itemNo == HEART || i_itemNo == TRIPLE_HEART) { + if (i_itemNo == fpcNm_ITEM_HEART || i_itemNo == fpcNm_ITEM_TRIPLE_HEART) { is_heart = true; } @@ -2052,30 +2052,30 @@ BOOL isInsect(u8 i_itemNo) { BOOL is_insect = false; switch (i_itemNo) { - case M_BEETLE: - case F_BEETLE: - case M_BUTTERFLY: - case F_BUTTERFLY: - case M_STAG_BEETLE: - case F_STAG_BEETLE: - case M_GRASSHOPPER: - case F_GRASSHOPPER: - case M_NANAFUSHI: - case F_NANAFUSHI: - case M_DANGOMUSHI: - case F_DANGOMUSHI: - case M_MANTIS: - case F_MANTIS: - case M_LADYBUG: - case F_LADYBUG: - case M_SNAIL: - case F_SNAIL: - case M_DRAGONFLY: - case F_DRAGONFLY: - case M_ANT: - case F_ANT: - case M_MAYFLY: - case F_MAYFLY: + case fpcNm_ITEM_M_BEETLE: + case fpcNm_ITEM_F_BEETLE: + case fpcNm_ITEM_M_BUTTERFLY: + case fpcNm_ITEM_F_BUTTERFLY: + case fpcNm_ITEM_M_STAG_BEETLE: + case fpcNm_ITEM_F_STAG_BEETLE: + case fpcNm_ITEM_M_GRASSHOPPER: + case fpcNm_ITEM_F_GRASSHOPPER: + case fpcNm_ITEM_M_NANAFUSHI: + case fpcNm_ITEM_F_NANAFUSHI: + case fpcNm_ITEM_M_DANGOMUSHI: + case fpcNm_ITEM_F_DANGOMUSHI: + case fpcNm_ITEM_M_MANTIS: + case fpcNm_ITEM_F_MANTIS: + case fpcNm_ITEM_M_LADYBUG: + case fpcNm_ITEM_F_LADYBUG: + case fpcNm_ITEM_M_SNAIL: + case fpcNm_ITEM_F_SNAIL: + case fpcNm_ITEM_M_DRAGONFLY: + case fpcNm_ITEM_F_DRAGONFLY: + case fpcNm_ITEM_M_ANT: + case fpcNm_ITEM_F_ANT: + case fpcNm_ITEM_M_MAYFLY: + case fpcNm_ITEM_F_MAYFLY: is_insect = true; } @@ -2083,18 +2083,18 @@ BOOL isInsect(u8 i_itemNo) { } u8 check_itemno(int i_itemNo) { - if (!dComIfGs_isGetMagicUseFlag() && (i_itemNo == S_MAGIC || i_itemNo == L_MAGIC)) { - return GREEN_RUPEE; + if (!dComIfGs_isGetMagicUseFlag() && (i_itemNo == fpcNm_ITEM_S_MAGIC || i_itemNo == fpcNm_ITEM_L_MAGIC)) { + return fpcNm_ITEM_GREEN_RUPEE; } - if (i_itemNo == ARROW_1) { - if (!dComIfGs_isItemFirstBit(BOW)) { - return GREEN_RUPEE; + if (i_itemNo == fpcNm_ITEM_ARROW_1) { + if (!dComIfGs_isItemFirstBit(fpcNm_ITEM_BOW)) { + return fpcNm_ITEM_GREEN_RUPEE; } } else { if (isArrow(i_itemNo)) { - if (!dComIfGs_isItemFirstBit(BOW)) { - return GREEN_RUPEE; + if (!dComIfGs_isItemFirstBit(fpcNm_ITEM_BOW)) { + return fpcNm_ITEM_GREEN_RUPEE; } if (g_dComIfG_gameInfo.play.getLayerNo(0) == 0xD || @@ -2103,23 +2103,23 @@ u8 check_itemno(int i_itemNo) { const char* stage_name = dComIfGp_getStartStageName(); // D_MN08: Palace of Twilight if (strncmp(stage_name, "D_MN08", 6)) { - return GREEN_RUPEE; + return fpcNm_ITEM_GREEN_RUPEE; } } } } - if (!dComIfGs_isItemFirstBit(BOMB_BAG_LV1) && isBomb(i_itemNo)) { - return GREEN_RUPEE; + if (!dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_BAG_LV1) && isBomb(i_itemNo)) { + return fpcNm_ITEM_GREEN_RUPEE; } else { - if (i_itemNo == TRIPLE_HEART) { - i_itemNo = HEART; + if (i_itemNo == fpcNm_ITEM_TRIPLE_HEART) { + i_itemNo = fpcNm_ITEM_HEART; } - if (!checkItemGet(PACHINKO, 1) && i_itemNo == PACHINKO_SHOT) { - i_itemNo = GREEN_RUPEE; + if (!checkItemGet(fpcNm_ITEM_PACHINKO, 1) && i_itemNo == fpcNm_ITEM_PACHINKO_SHOT) { + i_itemNo = fpcNm_ITEM_GREEN_RUPEE; } - if (i_itemNo == S_MAGIC || i_itemNo == L_MAGIC) { - i_itemNo = GREEN_RUPEE; + if (i_itemNo == fpcNm_ITEM_S_MAGIC || i_itemNo == fpcNm_ITEM_L_MAGIC) { + i_itemNo = fpcNm_ITEM_GREEN_RUPEE; } } return i_itemNo; @@ -2133,7 +2133,7 @@ int addBombCount(u8 i_bombType, u8 i_addNum) { for (u8 i = 0; i < 3; i++) { bombType[i] = dComIfGs_getItem(i + SLOT_15, false); - if (bombType[i] == BOMB_BAG_LV1) { + if (bombType[i] == fpcNm_ITEM_BOMB_BAG_LV1) { bombNum[i] = 0; } else if (bombType[i] == i_bombType) { bombNum[i] = dComIfGs_getBombNum(i); diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 47b9a003bb..55fb1a60f3 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -1777,7 +1777,7 @@ static void dKy_calc_color_set(GXColorS10* o_calcColor, color_RGB_class* i_col0A } inline bool checkZoraWearFlg() { - return dComIfGs_getSelectEquipClothes() == WEAR_ZORA; + return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_WEAR_ZORA; } /* 801A040C-801A133C 19AD4C 0F30+00 1/1 0/0 0/0 .text setLight__18dScnKy_env_light_cFv */ diff --git a/src/d/d_menu_collect.cpp b/src/d/d_menu_collect.cpp index 543ebabf56..60f4928b96 100644 --- a/src/d/d_menu_collect.cpp +++ b/src/d/d_menu_collect.cpp @@ -364,7 +364,7 @@ void dMenu_Collect2D_c::screenSet() { field_0x22d[0][2] = 0; field_0x22d[1][2] = 0; field_0x22d[2][2] = 0; - if (dComIfGs_getSelectEquipClothes() == WEAR_CASUAL) { + if (dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_WEAR_CASUAL) { field_0x22d[3][2] = 0; field_0x22d[4][2] = 0; field_0x22d[5][2] = 0; @@ -375,7 +375,7 @@ void dMenu_Collect2D_c::screenSet() { } field_0x22d[6][2] = 0; field_0x22d[0][3] = 1; - if (checkItemGet(BOW, 1)) { + if (checkItemGet(fpcNm_ITEM_BOW, 1)) { field_0x22d[1][3] = 1; } else { field_0x22d[1][3] = 0; @@ -389,7 +389,7 @@ void dMenu_Collect2D_c::screenSet() { field_0x22d[4][3] = 0; field_0x22d[5][3] = 0; field_0x22d[6][3] = 0; - if (dComIfGs_getCollectSmell() != NO_ITEM) { + if (dComIfGs_getCollectSmell() != fpcNm_ITEM_NONE) { field_0x22d[0][4] = 1; } else { field_0x22d[0][4] = 0; @@ -986,39 +986,39 @@ void dMenu_Collect2D_c::cursorPosSet() { void dMenu_Collect2D_c::changeSword() { switch (mCursorX) { case 3: - if (dComIfGs_isItemFirstBit(SWORD)) { - if (dComIfGs_getSelectEquipSword() != SWORD) { - dMeter2Info_setSword(SWORD, false); + if (dComIfGs_isItemFirstBit(fpcNm_ITEM_SWORD)) { + if (dComIfGs_getSelectEquipSword() != fpcNm_ITEM_SWORD) { + dMeter2Info_setSword(fpcNm_ITEM_SWORD, false); setEquipItemFrameColorSword(0); mDoAud_seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0); dMeter2Info_set2DVibration(); } - } else if (dComIfGs_getSelectEquipSword() != WOOD_STICK) { - dMeter2Info_setSword(WOOD_STICK, false); + } else if (dComIfGs_getSelectEquipSword() != fpcNm_ITEM_WOOD_STICK) { + dMeter2Info_setSword(fpcNm_ITEM_WOOD_STICK, false); setEquipItemFrameColorSword(0); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); dMeter2Info_set2DVibration(); } break; case 4: - if (dComIfGs_isItemFirstBit(LIGHT_SWORD)) { - if (dComIfGs_getSelectEquipSword() != LIGHT_SWORD) { - dMeter2Info_setSword(LIGHT_SWORD, false); + if (dComIfGs_isItemFirstBit(fpcNm_ITEM_LIGHT_SWORD)) { + if (dComIfGs_getSelectEquipSword() != fpcNm_ITEM_LIGHT_SWORD) { + dMeter2Info_setSword(fpcNm_ITEM_LIGHT_SWORD, false); setEquipItemFrameColorSword(1); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); dMeter2Info_set2DVibration(); } - } else if (dComIfGs_getSelectEquipSword() != MASTER_SWORD) { - dMeter2Info_setSword(MASTER_SWORD, false); + } else if (dComIfGs_getSelectEquipSword() != fpcNm_ITEM_MASTER_SWORD) { + dMeter2Info_setSword(fpcNm_ITEM_MASTER_SWORD, false); setEquipItemFrameColorSword(1); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); dMeter2Info_set2DVibration(); } break; case 5: - if (dComIfGs_getSelectEquipSword() != LIGHT_SWORD) { - dMeter2Info_setSword(LIGHT_SWORD, false); + if (dComIfGs_getSelectEquipSword() != fpcNm_ITEM_LIGHT_SWORD) { + dMeter2Info_setSword(fpcNm_ITEM_LIGHT_SWORD, false); setEquipItemFrameColorSword(2); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); dMeter2Info_set2DVibration(); @@ -1032,18 +1032,18 @@ void dMenu_Collect2D_c::changeSword() { void dMenu_Collect2D_c::changeShield() { switch (mCursorX) { case 3: - if (dComIfGs_isItemFirstBit(SHIELD)) { - if (dComIfGs_getSelectEquipShield() != SHIELD) { - dMeter2Info_setShield(SHIELD, false); + if (dComIfGs_isItemFirstBit(fpcNm_ITEM_SHIELD)) { + if (dComIfGs_getSelectEquipShield() != fpcNm_ITEM_SHIELD) { + dMeter2Info_setShield(fpcNm_ITEM_SHIELD, false); setEquipItemFrameColorShield(0); daAlink_getAlinkActorClass()->setShieldChange(); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); dMeter2Info_set2DVibration(); } - } else if (dComIfGs_isItemFirstBit(WOOD_SHIELD)) { - if (dComIfGs_getSelectEquipShield() != WOOD_SHIELD) { - dMeter2Info_setShield(WOOD_SHIELD, false); + } else if (dComIfGs_isItemFirstBit(fpcNm_ITEM_WOOD_SHIELD)) { + if (dComIfGs_getSelectEquipShield() != fpcNm_ITEM_WOOD_SHIELD) { + dMeter2Info_setShield(fpcNm_ITEM_WOOD_SHIELD, false); setEquipItemFrameColorShield(0); daAlink_getAlinkActorClass()->setShieldChange(); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, @@ -1053,8 +1053,8 @@ void dMenu_Collect2D_c::changeShield() { } break; case 4: - if (dComIfGs_getSelectEquipShield() != HYLIA_SHIELD) { - dMeter2Info_setShield(HYLIA_SHIELD, false); + if (dComIfGs_getSelectEquipShield() != fpcNm_ITEM_HYLIA_SHIELD) { + dMeter2Info_setShield(fpcNm_ITEM_HYLIA_SHIELD, false); setEquipItemFrameColorShield(1); daAlink_getAlinkActorClass()->setShieldChange(); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); @@ -1069,8 +1069,8 @@ void dMenu_Collect2D_c::changeShield() { void dMenu_Collect2D_c::changeClothe() { switch (mCursorX) { case 3: - if (dComIfGs_getSelectEquipClothes() != WEAR_KOKIRI) { - dMeter2Info_setCloth(WEAR_KOKIRI, false); + if (dComIfGs_getSelectEquipClothes() != fpcNm_ITEM_WEAR_KOKIRI) { + dMeter2Info_setCloth(fpcNm_ITEM_WEAR_KOKIRI, false); setEquipItemFrameColorClothes(0); daPy_getPlayerActorClass()->setClothesChange(0); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); @@ -1078,8 +1078,8 @@ void dMenu_Collect2D_c::changeClothe() { } break; case 4: - if (dComIfGs_getSelectEquipClothes() != WEAR_ZORA) { - dMeter2Info_setCloth(WEAR_ZORA, false); + if (dComIfGs_getSelectEquipClothes() != fpcNm_ITEM_WEAR_ZORA) { + dMeter2Info_setCloth(fpcNm_ITEM_WEAR_ZORA, false); setEquipItemFrameColorClothes(1); daPy_getPlayerActorClass()->setClothesChange(0); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); @@ -1087,8 +1087,8 @@ void dMenu_Collect2D_c::changeClothe() { } break; case 5: - if (dComIfGs_getSelectEquipClothes() != ARMOR) { - dMeter2Info_setCloth(ARMOR, false); + if (dComIfGs_getSelectEquipClothes() != fpcNm_ITEM_ARMOR) { + dMeter2Info_setCloth(fpcNm_ITEM_ARMOR, false); setEquipItemFrameColorClothes(2); daPy_getPlayerActorClass()->setClothesChange(0); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); @@ -1153,19 +1153,19 @@ void dMenu_Collect2D_c::setSmellType() { }; s32 smellType = -1; switch (dComIfGs_getCollectSmell()) { - case SMELL_YELIA_POUCH: + case fpcNm_ITEM_SMELL_YELIA_POUCH: smellType = 3; break; - case SMELL_POH: + case fpcNm_ITEM_SMELL_POH: smellType = 4; break; - case SMELL_FISH: + case fpcNm_ITEM_SMELL_FISH: smellType = 2; break; - case SMELL_CHILDREN: + case fpcNm_ITEM_SMELL_CHILDREN: smellType = 1; break; - case SMELL_MEDICINE: + case fpcNm_ITEM_SMELL_MEDICINE: smellType = 0; break; } @@ -1248,20 +1248,20 @@ void dMenu_Collect2D_c::setEquipItemFrameColorSword(int i_frame) { mEquippedSword = dComIfGs_getSelectEquipSword(); switch (mEquippedSword) { - case SWORD: + case fpcNm_ITEM_SWORD: i_frame = 0; break; - case WOOD_STICK: + case fpcNm_ITEM_WOOD_STICK: i_frame = 0; break; - case MASTER_SWORD: + case fpcNm_ITEM_MASTER_SWORD: i_frame = 1; break; - case LIGHT_SWORD: - if (dComIfGs_isItemFirstBit(LIGHT_SWORD)) { + case fpcNm_ITEM_LIGHT_SWORD: + if (dComIfGs_isItemFirstBit(fpcNm_ITEM_LIGHT_SWORD)) { i_frame = 1; } break; @@ -1307,12 +1307,12 @@ void dMenu_Collect2D_c::setEquipItemFrameColorShield(int i_frame) { mEquippedShield = dComIfGs_getSelectEquipShield(); switch (mEquippedShield) { - case SHIELD: - case WOOD_SHIELD: + case fpcNm_ITEM_SHIELD: + case fpcNm_ITEM_WOOD_SHIELD: i_frame = 0; break; - case HYLIA_SHIELD: + case fpcNm_ITEM_HYLIA_SHIELD: i_frame = 1; break; } @@ -1358,15 +1358,15 @@ void dMenu_Collect2D_c::setEquipItemFrameColorClothes(int i_frame) { mEquippedClothes = dComIfGs_getSelectEquipClothes(); switch (mEquippedClothes) { - case WEAR_KOKIRI: + case fpcNm_ITEM_WEAR_KOKIRI: i_frame = 0; break; - case WEAR_ZORA: + case fpcNm_ITEM_WEAR_ZORA: i_frame = 1; break; - case ARMOR: + case fpcNm_ITEM_ARMOR: i_frame = 2; break; } diff --git a/src/d/d_menu_insect.cpp b/src/d/d_menu_insect.cpp index 87be9475fa..2e137b27ef 100644 --- a/src/d/d_menu_insect.cpp +++ b/src/d/d_menu_insect.cpp @@ -563,10 +563,10 @@ void dMenu_Insect_c::screenSetDoIcon() { */ u8 dMenu_Insect_c::getGetInsectNum() { static u8 l_itemno[MAX_INSECT_NUM] = { - M_BEETLE, F_BEETLE, M_BUTTERFLY, F_BUTTERFLY, M_STAG_BEETLE, F_STAG_BEETLE, - M_GRASSHOPPER, F_GRASSHOPPER, M_NANAFUSHI, F_NANAFUSHI, M_DANGOMUSHI, F_DANGOMUSHI, - M_MANTIS, F_MANTIS, M_LADYBUG, F_LADYBUG, M_SNAIL, F_SNAIL, - M_DRAGONFLY, F_DRAGONFLY, M_ANT, F_ANT, M_MAYFLY, F_MAYFLY, + fpcNm_ITEM_M_BEETLE, fpcNm_ITEM_F_BEETLE, fpcNm_ITEM_M_BUTTERFLY, fpcNm_ITEM_F_BUTTERFLY, fpcNm_ITEM_M_STAG_BEETLE, fpcNm_ITEM_F_STAG_BEETLE, + fpcNm_ITEM_M_GRASSHOPPER, fpcNm_ITEM_F_GRASSHOPPER, fpcNm_ITEM_M_NANAFUSHI, fpcNm_ITEM_F_NANAFUSHI, fpcNm_ITEM_M_DANGOMUSHI, fpcNm_ITEM_F_DANGOMUSHI, + fpcNm_ITEM_M_MANTIS, fpcNm_ITEM_F_MANTIS, fpcNm_ITEM_M_LADYBUG, fpcNm_ITEM_F_LADYBUG, fpcNm_ITEM_M_SNAIL, fpcNm_ITEM_F_SNAIL, + fpcNm_ITEM_M_DRAGONFLY, fpcNm_ITEM_F_DRAGONFLY, fpcNm_ITEM_M_ANT, fpcNm_ITEM_F_ANT, fpcNm_ITEM_M_MAYFLY, fpcNm_ITEM_F_MAYFLY, }; u8 insectNum = 0; @@ -585,10 +585,10 @@ u8 dMenu_Insect_c::getGetInsectNum() { /* 801D9DCC-801D9DE4 1D470C 0018+00 3/3 0/0 0/0 .text getInsectItemID__14dMenu_Insect_cFii */ u8 dMenu_Insect_c::getInsectItemID(int param_0, int param_1) { static u8 l_itemno[MAX_INSECT_NUM] = { - M_ANT, F_ANT, M_MAYFLY, F_MAYFLY, M_BEETLE, F_BEETLE, - M_MANTIS, F_MANTIS, M_STAG_BEETLE, F_STAG_BEETLE, M_DANGOMUSHI, F_DANGOMUSHI, - M_BUTTERFLY, F_BUTTERFLY, M_LADYBUG, F_LADYBUG, M_SNAIL, F_SNAIL, - M_NANAFUSHI, F_NANAFUSHI, M_GRASSHOPPER, F_GRASSHOPPER, M_DRAGONFLY, F_DRAGONFLY, + fpcNm_ITEM_M_ANT, fpcNm_ITEM_F_ANT, fpcNm_ITEM_M_MAYFLY, fpcNm_ITEM_F_MAYFLY, fpcNm_ITEM_M_BEETLE, fpcNm_ITEM_F_BEETLE, + fpcNm_ITEM_M_MANTIS, fpcNm_ITEM_F_MANTIS, fpcNm_ITEM_M_STAG_BEETLE, fpcNm_ITEM_F_STAG_BEETLE, fpcNm_ITEM_M_DANGOMUSHI, fpcNm_ITEM_F_DANGOMUSHI, + fpcNm_ITEM_M_BUTTERFLY, fpcNm_ITEM_F_BUTTERFLY, fpcNm_ITEM_M_LADYBUG, fpcNm_ITEM_F_LADYBUG, fpcNm_ITEM_M_SNAIL, fpcNm_ITEM_F_SNAIL, + fpcNm_ITEM_M_NANAFUSHI, fpcNm_ITEM_F_NANAFUSHI, fpcNm_ITEM_M_GRASSHOPPER, fpcNm_ITEM_F_GRASSHOPPER, fpcNm_ITEM_M_DRAGONFLY, fpcNm_ITEM_F_DRAGONFLY, }; int index = param_0 + param_1 * 6; @@ -615,7 +615,7 @@ bool dMenu_Insect_c::isGiveInsect(int param_0, int param_1) { /* 801D9E7C-801D9ED4 1D47BC 0058+00 1/1 0/0 0/0 .text isCatchInsect__14dMenu_Insect_cFUc */ bool dMenu_Insect_c::isCatchInsect(u8 i_insectID) { - if (i_insectID >= M_BEETLE && i_insectID <= F_MAYFLY) { + if (i_insectID >= fpcNm_ITEM_M_BEETLE && i_insectID <= fpcNm_ITEM_F_MAYFLY) { return dComIfGs_isItemFirstBit(i_insectID); } return false; @@ -624,7 +624,7 @@ bool dMenu_Insect_c::isCatchInsect(u8 i_insectID) { /* 801D9ED4-801D9F3C 1D4814 0068+00 1/1 0/0 0/0 .text isGiveInsect__14dMenu_Insect_cFUc */ bool dMenu_Insect_c::isGiveInsect(u8 i_insectID) { - if (i_insectID >= M_BEETLE && i_insectID <= F_MAYFLY) { + if (i_insectID >= fpcNm_ITEM_M_BEETLE && i_insectID <= fpcNm_ITEM_F_MAYFLY) { int label = i_insectID + 0xd1; return dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[label]); } @@ -779,4 +779,4 @@ void dMenu_Insect_c::setHIO(bool i_useHIO) { g_drawHIO.mCollectScreen.mButtonBTextScale); } } -} \ No newline at end of file +} diff --git a/src/d/d_menu_item_explain.cpp b/src/d/d_menu_item_explain.cpp index eafb323afb..9199981784 100644 --- a/src/d/d_menu_item_explain.cpp +++ b/src/d/d_menu_item_explain.cpp @@ -369,7 +369,7 @@ void dMenu_ItemExplain_c::open_init() { if (i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 0x11) { s32 itemsObtained = 0; for (int i = 0; i < 3; i++) { - if (checkItemGet(i + L2_KEY_PIECES1, 1) != 0) { + if (checkItemGet(i + fpcNm_ITEM_L2_KEY_PIECES1, 1) != 0) { itemsObtained++; } } @@ -648,7 +648,7 @@ u8 dMenu_ItemExplain_c::openExplainDmap(u8 param_0, u8 param_1, u8 param_2, bool if (i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 0x11 && param_0 == 0x26) { for (int i = 0; i < 3; i++) { - if (checkItemGet(i + L2_KEY_PIECES1, 1) != 0) { + if (checkItemGet(i + fpcNm_ITEM_L2_KEY_PIECES1, 1) != 0) { itemsObtained++; } } @@ -830,4 +830,4 @@ void dMenu_ItemExplain_c::setScale() { f32 h = mpExpItemTex[0]->height / 48.0f * scale; mpInfoIcon->scale(w, h); } -} \ No newline at end of file +} diff --git a/src/d/d_menu_ring.cpp b/src/d/d_menu_ring.cpp index ae953edab7..fff0541c50 100644 --- a/src/d/d_menu_ring.cpp +++ b/src/d/d_menu_ring.cpp @@ -213,7 +213,7 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i mItemSlotParam1[i] = 0.0f; } for (int i = 0; i < MAX_ITEM_SLOTS; i++) { - if (dComIfGs_getLineUpItem(i) != NO_ITEM) { + if (dComIfGs_getLineUpItem(i) != fpcNm_ITEM_NONE) { mTotalItemTexToAlloc++; } } @@ -287,10 +287,10 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i mpItemBuf[i][j] = (ResTIMG*)mpHeap->alloc(0xC00, 0x20); } u8 item = dComIfGs_getItem(mItemSlots[i], false); - if (item != NO_ITEM) { - if (item == LIGHT_ARROW) { + if (item != fpcNm_ITEM_NONE) { + if (item == fpcNm_ITEM_LIGHT_ARROW) { // safety check to prevent attempts setting up a light arrow texture - item = BOW; + item = fpcNm_ITEM_BOW; } s32 i_textureNum = dMeter2Info_readItemTexture(item, mpItemBuf[i][0], NULL, mpItemBuf[i][1], NULL, @@ -397,7 +397,7 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i mpItemExplain = new dMenu_ItemExplain_c(mpHeap, dComIfGp_getRingResArchive(), i_stick, true); setRotate(); mpDrawCursor->setPos(mItemSlotPosX[0] + mCenterPosX, mItemSlotPosY[0] + mCenterPosY); - if (dComIfGs_getItem(mItemSlots[0], false) != NO_ITEM) { + if (dComIfGs_getItem(mItemSlots[0], false) != fpcNm_ITEM_NONE) { mpDrawCursor->setParam(mItemSlotParam1[0], mItemSlotParam2[0], 0.1f, 0.6f, 0.5f); } else { mpDrawCursor->setParam(1.0f, 1.0f, 0.1f, 0.6f, 0.5f); @@ -640,7 +640,7 @@ bool dMenu_Ring_c::isOpen() { } setScale(); mpDrawCursor->setPos(mItemSlotPosX[SLOT_0] + mCenterPosX, mItemSlotPosY[SLOT_0] + mCenterPosY); - if (dComIfGs_getItem(mItemSlots[SLOT_0], false) != NO_ITEM) { + if (dComIfGs_getItem(mItemSlots[SLOT_0], false) != fpcNm_ITEM_NONE) { mpDrawCursor->setParam(mItemSlotParam1[0], mItemSlotParam2[0], 0.1f, 0.6f, 0.5f); } else { mpDrawCursor->setParam(1.0f, 1.0f, 0.1f, 0.6f, 0.5f); @@ -704,7 +704,7 @@ bool dMenu_Ring_c::isClose() { } mpDrawCursor->setPos(mItemSlotPosX[mCurrentSlot] + mCenterPosX, mItemSlotPosY[mCurrentSlot] + mCenterPosY); - if (dComIfGs_getItem(mItemSlots[mCurrentSlot], false) != NO_ITEM) { + if (dComIfGs_getItem(mItemSlots[mCurrentSlot], false) != fpcNm_ITEM_NONE) { mpDrawCursor->setParam(mItemSlotParam1[mCurrentSlot], mItemSlotParam2[mCurrentSlot], 0.1f, 0.6f, 0.5f); } else { @@ -869,25 +869,25 @@ void dMenu_Ring_c::setItem() { u8 uVar3; u8 uVar4; - if (mXButtonSlot != NO_ITEM) { + if (mXButtonSlot != fpcNm_ITEM_NONE) { uVar1 = mItemSlots[mXButtonSlot]; } else { - uVar1 = NO_ITEM; + uVar1 = fpcNm_ITEM_NONE; } - if (mYButtonSlot != NO_ITEM) { + if (mYButtonSlot != fpcNm_ITEM_NONE) { uVar2 = mItemSlots[mYButtonSlot]; } else { - uVar2 = NO_ITEM; + uVar2 = fpcNm_ITEM_NONE; } - if (field_0x6ac != NO_ITEM) { + if (field_0x6ac != fpcNm_ITEM_NONE) { uVar3 = mItemSlots[field_0x6ac]; } else { - uVar3 = NO_ITEM; + uVar3 = fpcNm_ITEM_NONE; } - if (field_0x6ad != NO_ITEM) { + if (field_0x6ad != fpcNm_ITEM_NONE) { uVar4 = mItemSlots[field_0x6ad]; } else { - uVar4 = NO_ITEM; + uVar4 = fpcNm_ITEM_NONE; } u8 mixItemIndex0 = dComIfGs_getMixItemIndex(0); @@ -903,30 +903,30 @@ void dMenu_Ring_c::setItem() { if (mItemSlots[mCurrentSlot] == uVar1) { uVar2 = dComIfGs_getSelectItemIndex(0); mixItemIndex1 = dComIfGs_getMixItemIndex(0); - if (uVar2 == NO_ITEM) { - mYButtonSlot = NO_ITEM; + if (uVar2 == fpcNm_ITEM_NONE) { + mYButtonSlot = fpcNm_ITEM_NONE; } else { mYButtonSlot = mXButtonSlot; } mXButtonSlot = mCurrentSlot; uVar1 = mItemSlots[mXButtonSlot]; - mixItemIndex0 = NO_ITEM; + mixItemIndex0 = fpcNm_ITEM_NONE; } else { if (dComIfGs_getMixItemIndex(1) == mItemSlots[mCurrentSlot]) { uVar2 = dComIfGs_getSelectItemIndex(0); - mixItemIndex1 = NO_ITEM; - if (uVar2 == NO_ITEM) { - mYButtonSlot = NO_ITEM; + mixItemIndex1 = fpcNm_ITEM_NONE; + if (uVar2 == fpcNm_ITEM_NONE) { + mYButtonSlot = fpcNm_ITEM_NONE; } else { mYButtonSlot = mXButtonSlot; } mXButtonSlot = mCurrentSlot; uVar1 = mItemSlots[mXButtonSlot]; - mixItemIndex0 = NO_ITEM; + mixItemIndex0 = fpcNm_ITEM_NONE; } else { mXButtonSlot = mCurrentSlot; uVar1 = mItemSlots[mXButtonSlot]; - mixItemIndex0 = NO_ITEM; + mixItemIndex0 = fpcNm_ITEM_NONE; } } } else if (field_0x6b3 == 1) { @@ -934,30 +934,30 @@ void dMenu_Ring_c::setItem() { u8 temp = dComIfGs_getSelectItemIndex(1); uVar1 = temp; mixItemIndex0 = dComIfGs_getMixItemIndex(1); - if (temp == NO_ITEM) { - mXButtonSlot = NO_ITEM; + if (temp == fpcNm_ITEM_NONE) { + mXButtonSlot = fpcNm_ITEM_NONE; } else { mXButtonSlot = mYButtonSlot; } mYButtonSlot = mCurrentSlot; uVar2 = mItemSlots[mYButtonSlot]; - mixItemIndex1 = NO_ITEM; + mixItemIndex1 = fpcNm_ITEM_NONE; } else { if (dComIfGs_getMixItemIndex(0) == mItemSlots[mCurrentSlot]) { uVar1 = dComIfGs_getSelectItemIndex(1); - mixItemIndex0 = NO_ITEM; - if (uVar1 == NO_ITEM) { - mXButtonSlot = NO_ITEM; + mixItemIndex0 = fpcNm_ITEM_NONE; + if (uVar1 == fpcNm_ITEM_NONE) { + mXButtonSlot = fpcNm_ITEM_NONE; } else { mXButtonSlot = mYButtonSlot; } mYButtonSlot = mCurrentSlot; uVar2 = mItemSlots[mYButtonSlot]; - mixItemIndex1 = NO_ITEM; + mixItemIndex1 = fpcNm_ITEM_NONE; } else { mYButtonSlot = mCurrentSlot; uVar2 = mItemSlots[mYButtonSlot]; - mixItemIndex1 = NO_ITEM; + mixItemIndex1 = fpcNm_ITEM_NONE; } } } @@ -967,9 +967,9 @@ void dMenu_Ring_c::setItem() { field_0x6b4[3] = uVar4; field_0x6b8[0] = mixItemIndex0; field_0x6b8[1] = mixItemIndex1; - field_0x6b8[2] = NO_ITEM; - field_0x6b8[3] = NO_ITEM; - field_0x6cd = NO_ITEM; + field_0x6b8[2] = fpcNm_ITEM_NONE; + field_0x6b8[3] = fpcNm_ITEM_NONE; + field_0x6cd = fpcNm_ITEM_NONE; setJumpItem(true); } @@ -984,19 +984,19 @@ void dMenu_Ring_c::setJumpItem(bool i_useVibrationM) { setSelectItem(i, getItem(field_0x6b4[i], field_0x6b8[i])); } } - if (mXButtonSlot != NO_ITEM) { + if (mXButtonSlot != fpcNm_ITEM_NONE) { field_0x518[0] = mItemSlotPosX[mXButtonSlot]; field_0x528[0] = mItemSlotPosY[mXButtonSlot]; } - if (mYButtonSlot != NO_ITEM) { + if (mYButtonSlot != fpcNm_ITEM_NONE) { field_0x518[1] = mItemSlotPosX[mYButtonSlot]; field_0x528[1] = mItemSlotPosY[mYButtonSlot]; } - if (field_0x6ac != NO_ITEM) { + if (field_0x6ac != fpcNm_ITEM_NONE) { field_0x518[2] = mItemSlotPosX[field_0x6ac]; field_0x528[2] = mItemSlotPosY[field_0x6ac]; } - if (field_0x6ad != NO_ITEM) { + if (field_0x6ad != fpcNm_ITEM_NONE) { field_0x518[3] = mItemSlotPosX[field_0x6ad]; field_0x528[3] = mItemSlotPosY[field_0x6ad]; } @@ -1109,12 +1109,12 @@ void dMenu_Ring_c::setNameString(u32 i_stringID) { void dMenu_Ring_c::setActiveCursor() { u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], false); if (mStatus == STATUS_WAIT && mOldStatus != STATUS_EXPLAIN_FORCE && mOldStatus != STATUS_EXPLAIN && mpItemExplain->getStatus() == 0) { - if (mDoCPd_c::getTrigR(PAD_1) && !mPlayerIsWolf && item != NO_ITEM) { + if (mDoCPd_c::getTrigR(PAD_1) && !mPlayerIsWolf && item != fpcNm_ITEM_NONE) { for (int i = 0; i < MAX_SELECT_ITEM; i++) { setSelectItemForce(i); } setMixItem(); - } else if (mDoCPd_c::getTrigX(PAD_1) && !mPlayerIsWolf && item != NO_ITEM) { + } else if (mDoCPd_c::getTrigX(PAD_1) && !mPlayerIsWolf && item != fpcNm_ITEM_NONE) { for (int i = 0; i < MAX_SELECT_ITEM; i++) { setSelectItemForce(i); } @@ -1126,7 +1126,7 @@ void dMenu_Ring_c::setActiveCursor() { (this->*stick_init[mStatus])(); } } - } else if (mDoCPd_c::getTrigY(PAD_1) && !mPlayerIsWolf && item != NO_ITEM) { + } else if (mDoCPd_c::getTrigY(PAD_1) && !mPlayerIsWolf && item != fpcNm_ITEM_NONE) { for (int i = 0; i < MAX_SELECT_ITEM; i++) { setSelectItemForce(i); } @@ -1151,7 +1151,7 @@ void dMenu_Ring_c::setMixItem() { bool bVar1 = false; u8 selectItemIndex0 = dComIfGs_getSelectItemIndex(0); u8 selectItemIndex1 = dComIfGs_getSelectItemIndex(1); - u8 local_28[4] = {NO_ITEM, NO_ITEM, NO_ITEM, NO_ITEM}; + u8 local_28[4] = {fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE}; if (dComIfGs_getMixItemIndex(0) == SLOT_4 && mItemSlots[mCurrentSlot] == dComIfGs_getSelectItemIndex(0)) @@ -1177,11 +1177,11 @@ void dMenu_Ring_c::setMixItem() { bVar1 = true; } else { switch (item) { - case NORMAL_BOMB: - case WATER_BOMB: - case POKE_BOMB: - case HAWK_EYE: - if ((dComIfGs_getSelectItemIndex(0) == 4 && dComIfGs_getMixItemIndex(0) == NO_ITEM) || + case fpcNm_ITEM_NORMAL_BOMB: + case fpcNm_ITEM_WATER_BOMB: + case fpcNm_ITEM_POKE_BOMB: + case fpcNm_ITEM_HAWK_EYE: + if ((dComIfGs_getSelectItemIndex(0) == 4 && dComIfGs_getMixItemIndex(0) == fpcNm_ITEM_NONE) || (dComIfGs_getMixItemIndex(0) == 4)) { Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_COMBINE_ON, NULL, 0, 0, 1.0f, 1.0f, -1.0f, @@ -1197,7 +1197,7 @@ void dMenu_Ring_c::setMixItem() { mYButtonSlot = 0xff; } } else if ((dComIfGs_getSelectItemIndex(1) == 4 && - dComIfGs_getMixItemIndex(1) == NO_ITEM) || + dComIfGs_getMixItemIndex(1) == fpcNm_ITEM_NONE) || (dComIfGs_getMixItemIndex(1) == 4)) { Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_COMBINE_ON, NULL, 0, 0, 1.0f, 1.0f, -1.0f, @@ -1220,10 +1220,10 @@ void dMenu_Ring_c::setMixItem() { field_0x6b4[0] = selectItemIndex0; field_0x6b4[1] = selectItemIndex1; setJumpItem(false); - if (local_28[0] != NO_ITEM) { + if (local_28[0] != fpcNm_ITEM_NONE) { mXButtonSlot = local_28[0]; } - if (local_28[1] != NO_ITEM) { + if (local_28[1] != fpcNm_ITEM_NONE) { mYButtonSlot = local_28[1]; } } @@ -1265,7 +1265,7 @@ void dMenu_Ring_c::drawItem() { f32 y = (48.0f - f1) * 0.5f + (mItemSlotPosY[i] - 24.0f + mCenterPosY); mpItemTex[i][j]->draw(x, y, f0, f1, 0, 0, 0); u8 item = dComIfGs_getItem(mItemSlots[i], false); - if ((j == 0 && item != BEE_CHILD) || (j == 2 && item == BEE_CHILD)) { + if ((j == 0 && item != fpcNm_ITEM_BEE_CHILD) || (j == 2 && item == fpcNm_ITEM_BEE_CHILD)) { u8 itemNum = getItemNum(mItemSlots[i]); u8 itemMaxNum = getItemMaxNum(mItemSlots[i]); if (itemMaxNum != 0) { @@ -1273,7 +1273,7 @@ void dMenu_Ring_c::drawItem() { drawNumber(itemNum, itemMaxNum, x + 24.0f, y + 48.0f); } } - if (j == 0 && item == KANTERA /* Lantern */) { + if (j == 0 && item == fpcNm_ITEM_KANTERA /* Lantern */) { setKanteraPos(x + 24.0f + 15.0f, y + 48.0f + 10.0f); mpKanteraMeter->setScale(0.64f, 0.64f); mpKanteraMeter->setNowGauge(dComIfGs_getMaxOil(), dComIfGs_getOil()); @@ -1308,7 +1308,7 @@ void dMenu_Ring_c::drawItem2() { f32 y = (48.0f - f1) * 0.5f + (mItemSlotPosY[idx] - 24.0f + mCenterPosY); mpItemTex[idx][i]->draw(x, y, f0, f1, 0, 0, 0); u8 item = dComIfGs_getItem(mItemSlots[idx], false); - if ((i == 0 && item != BEE_CHILD) || (i == 2 && item == BEE_CHILD)) { + if ((i == 0 && item != fpcNm_ITEM_BEE_CHILD) || (i == 2 && item == fpcNm_ITEM_BEE_CHILD)) { u8 itemNum = getItemNum(mItemSlots[idx]); u8 itemMaxNum = getItemMaxNum(mItemSlots[idx]); if (itemMaxNum != 0) { @@ -1316,7 +1316,7 @@ void dMenu_Ring_c::drawItem2() { drawNumber(itemNum, itemMaxNum, x + 24.0f, y + 48.0f); } } - if (i == 0 && item == KANTERA) { + if (i == 0 && item == fpcNm_ITEM_KANTERA) { setKanteraPos(x + 24.0f + 15.0f, y + 48.0f + 10.0f); mpKanteraMeter->setScale(0.64f, 0.64f); mpKanteraMeter->setNowGauge(dComIfGs_getMaxOil(), dComIfGs_getOil()); @@ -1350,7 +1350,7 @@ void dMenu_Ring_c::stick_wait_init() { void dMenu_Ring_c::stick_wait_proc() { u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], false); - if (item != NO_ITEM) { + if (item != fpcNm_ITEM_NONE) { setDoStatus(0x24); } else { setDoStatus(0); @@ -1403,7 +1403,7 @@ void dMenu_Ring_c::stick_move_proc() { field_0x66e = field_0x670; mpDrawCursor->setPos(mItemSlotPosX[mCurrentSlot], mItemSlotPosY[mCurrentSlot]); u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], false); - if (item != NO_ITEM) { + if (item != fpcNm_ITEM_NONE) { mpDrawCursor->setParam(mItemSlotParam1[mCurrentSlot], mItemSlotParam2[mCurrentSlot], 0.1f, 0.6f, 0.5f); } else { @@ -1430,7 +1430,7 @@ void dMenu_Ring_c::stick_move_proc() { field_0x66e = field_0x670; mpDrawCursor->setPos(mItemSlotPosX[mCurrentSlot], mItemSlotPosY[mCurrentSlot]); u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], false); - if (item != NO_ITEM) { + if (item != fpcNm_ITEM_NONE) { mpDrawCursor->setParam(mItemSlotParam1[mCurrentSlot], mItemSlotParam2[mCurrentSlot], 0.1f, 0.6f, 0.5f); } else { @@ -1498,7 +1498,7 @@ void dMenu_Ring_c::stick_explain_force_proc() { void dMenu_Ring_c::setSelectItem(int i_idx, u8 i_itemNo) { f32 texScale = 1.0f; - if (i_itemNo != NO_ITEM) { + if (i_itemNo != fpcNm_ITEM_NONE) { if (field_0x6be[i_idx] == 0) { field_0x6be[i_idx] = 1; } else { @@ -1597,26 +1597,26 @@ u8 dMenu_Ring_c::getItemNum(u8 i_slotNo) { u8 ret = 0; switch (item) { - case BOMB_BAG_LV1: + case fpcNm_ITEM_BOMB_BAG_LV1: ret = 0; break; - case NORMAL_BOMB: - case WATER_BOMB: - case POKE_BOMB: + case fpcNm_ITEM_NORMAL_BOMB: + case fpcNm_ITEM_WATER_BOMB: + case fpcNm_ITEM_POKE_BOMB: ret = dComIfGs_getBombNum(i_slotNo - 0xF); break; - case BEE_CHILD: + case fpcNm_ITEM_BEE_CHILD: ret = dComIfGs_getBottleNum(i_slotNo - 0xB); break; - case BOW: - case LIGHT_ARROW: - case ARROW_LV1: - case ARROW_LV2: - case ARROW_LV3: + case fpcNm_ITEM_BOW: + case fpcNm_ITEM_LIGHT_ARROW: + case fpcNm_ITEM_ARROW_LV1: + case fpcNm_ITEM_ARROW_LV2: + case fpcNm_ITEM_ARROW_LV3: ret = dComIfGs_getArrowNum(); break; - case PACHINKO: + case fpcNm_ITEM_PACHINKO: ret = dComIfGs_getPachinkoNum(); break; } @@ -1637,26 +1637,26 @@ u8 dMenu_Ring_c::getItemMaxNum(u8 i_slotNo) { u8 ret = 0; switch (item) { - case BOMB_BAG_LV1: + case fpcNm_ITEM_BOMB_BAG_LV1: ret = 1; break; - case NORMAL_BOMB: - case WATER_BOMB: - case POKE_BOMB: + case fpcNm_ITEM_NORMAL_BOMB: + case fpcNm_ITEM_WATER_BOMB: + case fpcNm_ITEM_POKE_BOMB: ret = dComIfGs_getBombMax(item); break; - case BEE_CHILD: + case fpcNm_ITEM_BEE_CHILD: ret = dComIfGs_getBottleMax(); break; - case BOW: - case LIGHT_ARROW: - case ARROW_LV1: - case ARROW_LV2: - case ARROW_LV3: + case fpcNm_ITEM_BOW: + case fpcNm_ITEM_LIGHT_ARROW: + case fpcNm_ITEM_ARROW_LV1: + case fpcNm_ITEM_ARROW_LV2: + case fpcNm_ITEM_ARROW_LV3: ret = dComIfGs_getArrowMax(); break; - case PACHINKO: + case fpcNm_ITEM_PACHINKO: ret = dComIfGs_getPachinkoMax(); break; } @@ -1675,105 +1675,105 @@ bool dMenu_Ring_c::checkExplainForce() { u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], true); for (int i = 0; i < 4; i++) { - local_18[i] = NO_ITEM; + local_18[i] = fpcNm_ITEM_NONE; } switch (item) { - case BOW: + case fpcNm_ITEM_BOW: switch (item0) { - case NORMAL_BOMB: - case WATER_BOMB: - case POKE_BOMB: - local_18[0] = BOMB_ARROW; + case fpcNm_ITEM_NORMAL_BOMB: + case fpcNm_ITEM_WATER_BOMB: + case fpcNm_ITEM_POKE_BOMB: + local_18[0] = fpcNm_ITEM_BOMB_ARROW; break; - case HAWK_EYE: - local_18[0] = HAWK_ARROW; + case fpcNm_ITEM_HAWK_EYE: + local_18[0] = fpcNm_ITEM_HAWK_ARROW; break; } switch (item1) { - case NORMAL_BOMB: - case WATER_BOMB: - case POKE_BOMB: - local_18[1] = BOMB_ARROW; + case fpcNm_ITEM_NORMAL_BOMB: + case fpcNm_ITEM_WATER_BOMB: + case fpcNm_ITEM_POKE_BOMB: + local_18[1] = fpcNm_ITEM_BOMB_ARROW; break; - case HAWK_EYE: - local_18[1] = HAWK_ARROW; + case fpcNm_ITEM_HAWK_EYE: + local_18[1] = fpcNm_ITEM_HAWK_ARROW; break; } break; - case NORMAL_BOMB: - case WATER_BOMB: - case POKE_BOMB: - if (item0 == BOW) { - local_18[0] = BOMB_ARROW; - } else if (item1 == BOW) { - local_18[1] = BOMB_ARROW; + case fpcNm_ITEM_NORMAL_BOMB: + case fpcNm_ITEM_WATER_BOMB: + case fpcNm_ITEM_POKE_BOMB: + if (item0 == fpcNm_ITEM_BOW) { + local_18[0] = fpcNm_ITEM_BOMB_ARROW; + } else if (item1 == fpcNm_ITEM_BOW) { + local_18[1] = fpcNm_ITEM_BOMB_ARROW; } break; - case HAWK_EYE: - if (item0 == BOW) { - local_18[0] = HAWK_ARROW; - } else if (item1 == BOW) { - local_18[1] = HAWK_ARROW; + case fpcNm_ITEM_HAWK_EYE: + if (item0 == fpcNm_ITEM_BOW) { + local_18[0] = fpcNm_ITEM_HAWK_ARROW; + } else if (item1 == fpcNm_ITEM_BOW) { + local_18[1] = fpcNm_ITEM_HAWK_ARROW; } break; - case BEE_CHILD: - if (item0 == FISHING_ROD_1) { - local_18[0] = BEE_ROD; - } else if (item1 == FISHING_ROD_1) { - local_18[1] = BEE_ROD; + case fpcNm_ITEM_BEE_CHILD: + if (item0 == fpcNm_ITEM_FISHING_ROD_1) { + local_18[0] = fpcNm_ITEM_BEE_ROD; + } else if (item1 == fpcNm_ITEM_FISHING_ROD_1) { + local_18[1] = fpcNm_ITEM_BEE_ROD; } break; - case WORM: - if (item0 == FISHING_ROD_1) { - local_18[0] = WORM_ROD; - } else if (item1 == FISHING_ROD_1) { - local_18[1] = WORM_ROD; + case fpcNm_ITEM_WORM: + if (item0 == fpcNm_ITEM_FISHING_ROD_1) { + local_18[0] = fpcNm_ITEM_WORM_ROD; + } else if (item1 == fpcNm_ITEM_FISHING_ROD_1) { + local_18[1] = fpcNm_ITEM_WORM_ROD; } break; - case ZORAS_JEWEL: - if (item0 == FISHING_ROD_1) { - local_18[0] = JEWEL_ROD; - } else if (item1 == FISHING_ROD_1) { - local_18[1] = JEWEL_ROD; + case fpcNm_ITEM_ZORAS_JEWEL: + if (item0 == fpcNm_ITEM_FISHING_ROD_1) { + local_18[0] = fpcNm_ITEM_JEWEL_ROD; + } else if (item1 == fpcNm_ITEM_FISHING_ROD_1) { + local_18[1] = fpcNm_ITEM_JEWEL_ROD; } break; - case FISHING_ROD_1: - if (item0 == BEE_CHILD) { - local_18[0] = BEE_ROD; - } else if (item1 == BEE_CHILD) { - local_18[1] = BEE_ROD; - } else if (item0 == ZORAS_JEWEL) { - local_18[0] = JEWEL_ROD; - } else if (item1 == ZORAS_JEWEL) { - local_18[1] = JEWEL_ROD; - } else if (item0 == WORM) { - local_18[0] = WORM_ROD; - } else if (item1 == WORM) { - local_18[1] = WORM_ROD; + case fpcNm_ITEM_FISHING_ROD_1: + if (item0 == fpcNm_ITEM_BEE_CHILD) { + local_18[0] = fpcNm_ITEM_BEE_ROD; + } else if (item1 == fpcNm_ITEM_BEE_CHILD) { + local_18[1] = fpcNm_ITEM_BEE_ROD; + } else if (item0 == fpcNm_ITEM_ZORAS_JEWEL) { + local_18[0] = fpcNm_ITEM_JEWEL_ROD; + } else if (item1 == fpcNm_ITEM_ZORAS_JEWEL) { + local_18[1] = fpcNm_ITEM_JEWEL_ROD; + } else if (item0 == fpcNm_ITEM_WORM) { + local_18[0] = fpcNm_ITEM_WORM_ROD; + } else if (item1 == fpcNm_ITEM_WORM) { + local_18[1] = fpcNm_ITEM_WORM_ROD; } break; } - if (local_18[0] != NO_ITEM && local_18[1] == NO_ITEM && local_18[2] == NO_ITEM && local_18[3] == NO_ITEM && - dComIfGs_getMixItemIndex(0) == NO_ITEM) + if (local_18[0] != fpcNm_ITEM_NONE && local_18[1] == fpcNm_ITEM_NONE && local_18[2] == fpcNm_ITEM_NONE && local_18[3] == fpcNm_ITEM_NONE && + dComIfGs_getMixItemIndex(0) == fpcNm_ITEM_NONE) { field_0x6c7[0] = local_18[0]; - field_0x6c7[1] = NO_ITEM; - field_0x6c7[2] = NO_ITEM; - field_0x6c7[3] = NO_ITEM; - } else if (local_18[0] == NO_ITEM && local_18[1] != NO_ITEM && local_18[2] == NO_ITEM && - local_18[3] == NO_ITEM && dComIfGs_getMixItemIndex(1) == NO_ITEM) + field_0x6c7[1] = fpcNm_ITEM_NONE; + field_0x6c7[2] = fpcNm_ITEM_NONE; + field_0x6c7[3] = fpcNm_ITEM_NONE; + } else if (local_18[0] == fpcNm_ITEM_NONE && local_18[1] != fpcNm_ITEM_NONE && local_18[2] == fpcNm_ITEM_NONE && + local_18[3] == fpcNm_ITEM_NONE && dComIfGs_getMixItemIndex(1) == fpcNm_ITEM_NONE) { - field_0x6c7[0] = NO_ITEM; + field_0x6c7[0] = fpcNm_ITEM_NONE; field_0x6c7[1] = local_18[1]; - field_0x6c7[2] = NO_ITEM; - field_0x6c7[3] = NO_ITEM; + field_0x6c7[2] = fpcNm_ITEM_NONE; + field_0x6c7[3] = fpcNm_ITEM_NONE; } else { - field_0x6c7[0] = NO_ITEM; - field_0x6c7[1] = NO_ITEM; - field_0x6c7[2] = NO_ITEM; - field_0x6c7[3] = NO_ITEM; + field_0x6c7[0] = fpcNm_ITEM_NONE; + field_0x6c7[1] = fpcNm_ITEM_NONE; + field_0x6c7[2] = fpcNm_ITEM_NONE; + field_0x6c7[3] = fpcNm_ITEM_NONE; } return 0; } @@ -1880,19 +1880,19 @@ void dMenu_Ring_c::setDoStatus(u8 i_doStatus) { /* 801EEB58-801EEC98 1E9498 0140+00 1/1 0/0 0/0 .text isMixItemOn__12dMenu_Ring_cFv */ bool dMenu_Ring_c::isMixItemOn() { - if (!mPlayerIsWolf && dComIfGs_getItem(mItemSlots[mCurrentSlot], false) != NO_ITEM) { + if (!mPlayerIsWolf && dComIfGs_getItem(mItemSlots[mCurrentSlot], false) != fpcNm_ITEM_NONE) { u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], false); switch (item) { - case HAWK_EYE: - case NORMAL_BOMB: - case WATER_BOMB: - case POKE_BOMB: - if ((dComIfGs_getSelectItemIndex(0) == SLOT_4) && (dComIfGs_getMixItemIndex(0) == NO_ITEM) || + case fpcNm_ITEM_HAWK_EYE: + case fpcNm_ITEM_NORMAL_BOMB: + case fpcNm_ITEM_WATER_BOMB: + case fpcNm_ITEM_POKE_BOMB: + if ((dComIfGs_getSelectItemIndex(0) == SLOT_4) && (dComIfGs_getMixItemIndex(0) == fpcNm_ITEM_NONE) || (dComIfGs_getMixItemIndex(0) == SLOT_4)) { return true; } - if ((dComIfGs_getSelectItemIndex(1) == SLOT_4) && (dComIfGs_getMixItemIndex(1) == NO_ITEM) || + if ((dComIfGs_getSelectItemIndex(1) == SLOT_4) && (dComIfGs_getMixItemIndex(1) == fpcNm_ITEM_NONE) || (dComIfGs_getMixItemIndex(1) == SLOT_4)) { return true; @@ -1905,7 +1905,7 @@ bool dMenu_Ring_c::isMixItemOn() { /* 801EEC98-801EED84 1E95D8 00EC+00 1/1 0/0 0/0 .text isMixItemOff__12dMenu_Ring_cFv */ bool dMenu_Ring_c::isMixItemOff() { - if ((!mPlayerIsWolf) && (dComIfGs_getItem(mItemSlots[mCurrentSlot], 0) != NO_ITEM)) { + if ((!mPlayerIsWolf) && (dComIfGs_getItem(mItemSlots[mCurrentSlot], 0) != fpcNm_ITEM_NONE)) { if ((dComIfGs_getMixItemIndex(0) == SLOT_4) && (mItemSlots[mCurrentSlot] == dComIfGs_getSelectItemIndex(0))) { diff --git a/src/d/d_menu_save.cpp b/src/d/d_menu_save.cpp index b363aa019b..c6965a7248 100644 --- a/src/d/d_menu_save.cpp +++ b/src/d/d_menu_save.cpp @@ -1601,8 +1601,8 @@ void dMenu_save_c::restartInit() { dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[225]); // Monkey dropped lantern } - if (dComIfGs_isItemFirstBit(KANTERA) && dComIfGs_getItem(SLOT_1, true) == NO_ITEM) { - dComIfGs_setItem(SLOT_1, KANTERA); + if (dComIfGs_isItemFirstBit(fpcNm_ITEM_KANTERA) && dComIfGs_getItem(SLOT_1, true) == fpcNm_ITEM_NONE) { + dComIfGs_setItem(SLOT_1, fpcNm_ITEM_KANTERA); dComIfGs_setOil(dMeter2Info_getOilGaugeBackUp()); } diff --git a/src/d/d_menu_window_HIO.cpp b/src/d/d_menu_window_HIO.cpp index 617a87fcd5..6490dc9a7d 100644 --- a/src/d/d_menu_window_HIO.cpp +++ b/src/d/d_menu_window_HIO.cpp @@ -13,9 +13,9 @@ dMw_HIO_c::dMw_HIO_c() { /* 801F9B38-801F9E14 1F4478 02DC+00 1/1 0/0 0/0 .text init__9dMw_HIO_cFv */ void dMw_HIO_c::init() { - static u8 m_cloth_item[3] = {WEAR_KOKIRI, ARMOR, WEAR_ZORA}; - static u8 m_sword_item[4] = {SWORD, MASTER_SWORD, LIGHT_SWORD, WOOD_STICK}; - static u8 m_shield_item[3] = {SHIELD, HYLIA_SHIELD, WOOD_SHIELD}; + static u8 m_cloth_item[3] = {fpcNm_ITEM_WEAR_KOKIRI, fpcNm_ITEM_ARMOR, fpcNm_ITEM_WEAR_ZORA}; + static u8 m_sword_item[4] = {fpcNm_ITEM_SWORD, fpcNm_ITEM_MASTER_SWORD, fpcNm_ITEM_LIGHT_SWORD, fpcNm_ITEM_WOOD_STICK}; + static u8 m_shield_item[3] = {fpcNm_ITEM_SHIELD, fpcNm_ITEM_HYLIA_SHIELD, fpcNm_ITEM_WOOD_SHIELD}; mArrowFlag = 0; mBombFlag = 0; @@ -57,8 +57,8 @@ void dMw_HIO_c::init() { mDonationAmount = 0; for (int i = 0; i < 24; i++) { - mItemsCopy[i] = NO_ITEM; - mItems[i] = NO_ITEM; + mItemsCopy[i] = fpcNm_ITEM_NONE; + mItems[i] = fpcNm_ITEM_NONE; field_0x7a[i] = 0; } @@ -72,8 +72,8 @@ void dMw_HIO_c::init() { mBombNum[i] = 0; } - mScentCopy = NO_ITEM; - mScent = NO_ITEM; + mScentCopy = fpcNm_ITEM_NONE; + mScent = fpcNm_ITEM_NONE; field_0xa8 = 0; field_0xf4 = 0; field_0xea = 0; @@ -171,4 +171,4 @@ dMw_DHIO_c::dMw_DHIO_c() { dMw_HIO_c g_mwHIO; /* 8042E9A8-8042EBB0 05B6C8 0208+00 0/1 1/1 0/0 .bss g_mwDHIO */ -dMw_DHIO_c g_mwDHIO; \ No newline at end of file +dMw_DHIO_c g_mwDHIO; diff --git a/src/d/d_meter2.cpp b/src/d/d_meter2.cpp index 6e7ca4f665..135edcc13e 100644 --- a/src/d/d_meter2.cpp +++ b/src/d/d_meter2.cpp @@ -188,22 +188,22 @@ int dMeter2_c::_create() { for (int i = 0; i < 2; i++) { if (field_0x128 == 0) { - if (mItemStatus[i * 2] == BOMB_BAG_LV1 || mItemStatus[i * 2] == NORMAL_BOMB || - mItemStatus[i * 2] == WATER_BOMB || mItemStatus[i * 2] == POKE_BOMB) + if (mItemStatus[i * 2] == fpcNm_ITEM_BOMB_BAG_LV1 || mItemStatus[i * 2] == fpcNm_ITEM_NORMAL_BOMB || + mItemStatus[i * 2] == fpcNm_ITEM_WATER_BOMB || mItemStatus[i * 2] == fpcNm_ITEM_POKE_BOMB) { mpMeterDraw->setItemNum(i, dComIfGp_getSelectItemNum(i), dComIfGp_getSelectItemMaxNum(i)); - } else if (mItemStatus[i * 2] == BEE_CHILD) { + } else if (mItemStatus[i * 2] == fpcNm_ITEM_BEE_CHILD) { mpMeterDraw->setItemNum(i, dComIfGp_getSelectItemNum(i), dComIfGp_getSelectItemMaxNum(i)); - } else if (mItemStatus[i * 2] == BOW || mItemStatus[i * 2] == LIGHT_ARROW || - mItemStatus[i * 2] == ARROW_LV1 || mItemStatus[i * 2] == ARROW_LV2 || - mItemStatus[i * 2] == ARROW_LV3 || mItemStatus[i * 2] == HAWK_ARROW) + } else if (mItemStatus[i * 2] == fpcNm_ITEM_BOW || mItemStatus[i * 2] == fpcNm_ITEM_LIGHT_ARROW || + mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV1 || mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV2 || + mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV3 || mItemStatus[i * 2] == fpcNm_ITEM_HAWK_ARROW) { mpMeterDraw->setItemNum(i, mArrowNum, dComIfGs_getArrowMax()); - } else if (mItemStatus[i * 2] == PACHINKO) { + } else if (mItemStatus[i * 2] == fpcNm_ITEM_PACHINKO) { mpMeterDraw->setItemNum(i, mPachinkoNum, dComIfGs_getPachinkoMax()); - } else if (mItemStatus[i * 2] == BOMB_ARROW) { + } else if (mItemStatus[i * 2] == fpcNm_ITEM_BOMB_ARROW) { u8 item_num = dComIfGp_getSelectItemNum(i); u8 item_max = dComIfGp_getSelectItemMaxNum(i); if (item_num > mArrowNum) { @@ -2499,7 +2499,7 @@ void dMeter2_c::moveBombNum() { temp_r31 = dComIfGs_getItem((u8)(i + SLOT_15), true); temp_r28 = dComIfGs_getItem((u8)(i + SLOT_15), false); - if (temp_r31 != NO_ITEM && temp_r31 != BOMB_BAG_LV1) { + if (temp_r31 != fpcNm_ITEM_NONE && temp_r31 != fpcNm_ITEM_BOMB_BAG_LV1) { if (g_mwHIO.getBombFlag() || (dMeter2Info_getMiniGameItemSetFlag() == 1 && i == dMeter2Info_getRentalBombBag())) { @@ -2527,7 +2527,7 @@ void dMeter2_c::moveBombNum() { } if (var_r22 == 0) { - if (temp_r31 == BOMB_ARROW) { + if (temp_r31 == fpcNm_ITEM_BOMB_ARROW) { for (int j = 0; j < 2; j++) { if (i + SLOT_15 == dComIfGs_getSelectItemIndex(j) || i + SLOT_15 == dComIfGs_getMixItemIndex(j)) @@ -2538,8 +2538,8 @@ void dMeter2_c::moveBombNum() { } } } - dComIfGs_setItem(i + SLOT_15, BOMB_BAG_LV1); - dComIfGp_setItem(i + SLOT_15, BOMB_BAG_LV1); + dComIfGs_setItem(i + SLOT_15, fpcNm_ITEM_BOMB_BAG_LV1); + dComIfGp_setItem(i + SLOT_15, fpcNm_ITEM_BOMB_BAG_LV1); for (int j = 0; j < 2; j++) { if (i + SLOT_15 == dComIfGs_getSelectMixItemNoArrowIndex(j)) { @@ -2551,7 +2551,7 @@ void dMeter2_c::moveBombNum() { dComIfGs_setBombNum(i, var_r22); mBombMax[i] = dComIfGs_getBombMax(temp_r28); - if (temp_r31 != BOMB_ARROW) { + if (temp_r31 != fpcNm_ITEM_BOMB_ARROW) { for (int j = 0; j < 2; j++) { if (i + SLOT_15 == dComIfGs_getSelectMixItemNoArrowIndex(j)) { mpMeterDraw->setItemNum(j, dComIfGp_getSelectItemNum(j), @@ -2561,7 +2561,7 @@ void dMeter2_c::moveBombNum() { } } } else { - if (temp_r31 != BOMB_BAG_LV1) { + if (temp_r31 != fpcNm_ITEM_BOMB_BAG_LV1) { dComIfGs_setBombNum(i, 0); } @@ -2592,7 +2592,7 @@ void dMeter2_c::moveBombNum() { /* 80224258-80224354 21EB98 00FC+00 1/1 0/0 0/0 .text moveBottleNum__9dMeter2_cFv */ void dMeter2_c::moveBottleNum() { for (int i = 0; i < 4; i++) { - if (dComIfGs_getItem((u8)(i + SLOT_11), true) == BEE_CHILD) { + if (dComIfGs_getItem((u8)(i + SLOT_11), true) == fpcNm_ITEM_BEE_CHILD) { if (mBottleNum[i] != dComIfGs_getBottleNum(i)) { for (int j = 0; j < 2; j++) { if (i + SLOT_11 == dComIfGs_getSelectItemIndex(j)) { @@ -2668,14 +2668,14 @@ void dMeter2_c::moveArrowNum() { i = 0; var_r28 = 0; for (; i < 2; i++, var_r28 += 2) { - if (mItemStatus[var_r28] == BOW || mItemStatus[var_r28] == LIGHT_ARROW || - mItemStatus[var_r28] == ARROW_LV1 || mItemStatus[var_r28] == ARROW_LV2 || - mItemStatus[var_r28] == ARROW_LV3 || mItemStatus[var_r28] == HAWK_ARROW) + if (mItemStatus[var_r28] == fpcNm_ITEM_BOW || mItemStatus[var_r28] == fpcNm_ITEM_LIGHT_ARROW || + mItemStatus[var_r28] == fpcNm_ITEM_ARROW_LV1 || mItemStatus[var_r28] == fpcNm_ITEM_ARROW_LV2 || + mItemStatus[var_r28] == fpcNm_ITEM_ARROW_LV3 || mItemStatus[var_r28] == fpcNm_ITEM_HAWK_ARROW) { mpMeterDraw->setItemNum(i, mArrowNum, dComIfGs_getArrowMax()); - } else if (mItemStatus[var_r28] == PACHINKO) { + } else if (mItemStatus[var_r28] == fpcNm_ITEM_PACHINKO) { mpMeterDraw->setItemNum(i, mPachinkoNum, dComIfGs_getPachinkoMax()); - } else if (mItemStatus[var_r28] == BOMB_ARROW) { + } else if (mItemStatus[var_r28] == fpcNm_ITEM_BOMB_ARROW) { var_r27 = dComIfGp_getSelectItemNum(i); var_r6_2 = dComIfGp_getSelectItemMaxNum(i); @@ -2750,7 +2750,7 @@ void dMeter2_c::movePachinkoNum() { } for (int i = 0; i < 2; i++) { - if (mItemStatus[i * 2] == PACHINKO) { + if (mItemStatus[i * 2] == fpcNm_ITEM_PACHINKO) { mpMeterDraw->setItemNum(i, mPachinkoNum, dComIfGs_getPachinkoMax()); } } @@ -2777,7 +2777,7 @@ void dMeter2_c::alphaAnimeLife() { /* 80224A04-80224BAC 21F344 01A8+00 1/1 0/0 0/0 .text alphaAnimeKantera__9dMeter2_cFv */ void dMeter2_c::alphaAnimeKantera() { - if (dComIfGs_getMaxOil() == 0 || dComIfGs_getItem(SLOT_1, true) != KANTERA || + if (dComIfGs_getMaxOil() == 0 || dComIfGs_getItem(SLOT_1, true) != fpcNm_ITEM_KANTERA || !daPy_getPlayerActorClass()->checkUseKandelaar(0) || (mStatus & 0x4000) || ((mStatus & 0x40) && dComIfGp_event_checkHind(0x400)) || dComIfGp_getOxygenShowFlag() || ((daPy_getPlayerActorClass()->getSumouMode() != 0) || @@ -2940,20 +2940,20 @@ void dMeter2_c::alphaAnimeButton() { field_0x128 == 0 ? true : false); if (field_0x128 == 0 && dMeter2Info_getMiniGameItemSetFlag() != 1 && - (mItemStatus[i * 2] == BOW || mItemStatus[i * 2] == LIGHT_ARROW || - mItemStatus[i * 2] == ARROW_LV1 || mItemStatus[i * 2] == ARROW_LV2 || - mItemStatus[i * 2] == ARROW_LV3 || mItemStatus[i * 2] == BOMB_BAG_LV1 || - mItemStatus[i * 2] == NORMAL_BOMB || mItemStatus[i * 2] == WATER_BOMB || - mItemStatus[i * 2] == POKE_BOMB || mItemStatus[i * 2] == HAWK_ARROW || - mItemStatus[i * 2] == BOMB_ARROW || mItemStatus[i * 2] == PACHINKO || - mItemStatus[i * 2] == BEE_CHILD)) + (mItemStatus[i * 2] == fpcNm_ITEM_BOW || mItemStatus[i * 2] == fpcNm_ITEM_LIGHT_ARROW || + mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV1 || mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV2 || + mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV3 || mItemStatus[i * 2] == fpcNm_ITEM_BOMB_BAG_LV1 || + mItemStatus[i * 2] == fpcNm_ITEM_NORMAL_BOMB || mItemStatus[i * 2] == fpcNm_ITEM_WATER_BOMB || + mItemStatus[i * 2] == fpcNm_ITEM_POKE_BOMB || mItemStatus[i * 2] == fpcNm_ITEM_HAWK_ARROW || + mItemStatus[i * 2] == fpcNm_ITEM_BOMB_ARROW || mItemStatus[i * 2] == fpcNm_ITEM_PACHINKO || + mItemStatus[i * 2] == fpcNm_ITEM_BEE_CHILD)) { mpMeterDraw->drawItemNum(i, 1.0f); } else { mpMeterDraw->drawItemNum(i, 0.0f); } - if (field_0x128 == 0 && mItemStatus[i * 2] == KANTERA) { + if (field_0x128 == 0 && mItemStatus[i * 2] == fpcNm_ITEM_KANTERA) { mpMeterDraw->drawKanteraMeter(i, 1.0f); } else { mpMeterDraw->drawKanteraMeter(i, 0.0f); @@ -3065,10 +3065,10 @@ u8 dMeter2_c::isKeyVisible() { /* 802259F8-80225A64 220338 006C+00 2/2 0/0 0/0 .text isArrowEquip__9dMeter2_cFv */ int dMeter2_c::isArrowEquip() { for (int i = 0; i < 2; i++) { - if (mItemStatus[i * 2] == BOW || mItemStatus[i * 2] == LIGHT_ARROW || - mItemStatus[i * 2] == ARROW_LV1 || mItemStatus[i * 2] == ARROW_LV2 || - mItemStatus[i * 2] == ARROW_LV3 || mItemStatus[i * 2] == HAWK_ARROW || - mItemStatus[i * 2] == BOMB_ARROW) + if (mItemStatus[i * 2] == fpcNm_ITEM_BOW || mItemStatus[i * 2] == fpcNm_ITEM_LIGHT_ARROW || + mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV1 || mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV2 || + mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV3 || mItemStatus[i * 2] == fpcNm_ITEM_HAWK_ARROW || + mItemStatus[i * 2] == fpcNm_ITEM_BOMB_ARROW) { return i + 1; } @@ -3079,7 +3079,7 @@ int dMeter2_c::isArrowEquip() { /* 80225A64-80225AA0 2203A4 003C+00 2/2 0/0 0/0 .text isPachinkoEquip__9dMeter2_cFv */ int dMeter2_c::isPachinkoEquip() { for (int i = 0; i < 2; i++) { - if (mItemStatus[i * 2] == PACHINKO) { + if (mItemStatus[i * 2] == fpcNm_ITEM_PACHINKO) { return i + 1; } } @@ -3148,4 +3148,4 @@ SECTION_DATA extern msg_process_profile_definition g_profile_METER2 = { &g_fopMsg_Method, 0x0301, &l_dMeter2_Method, -}; \ No newline at end of file +}; diff --git a/src/d/d_meter2_draw.cpp b/src/d/d_meter2_draw.cpp index c234885c7d..f3b12eeea4 100644 --- a/src/d/d_meter2_draw.cpp +++ b/src/d/d_meter2_draw.cpp @@ -1173,7 +1173,7 @@ void dMeter2Draw_c::initButton() { } } - mButtonBItem = SWORD; + mButtonBItem = fpcNm_ITEM_SWORD; changeTextureItemB(mButtonBItem); for (int i = 0; i < 2; i++) { @@ -2362,10 +2362,10 @@ void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_pos mButtonBItem = dComIfGs_getSelectEquipSword(); switch (dComIfGs_getSelectEquipSword()) { - case WOOD_STICK: - case SWORD: - case MASTER_SWORD: - case LIGHT_SWORD: + case fpcNm_ITEM_WOOD_STICK: + case fpcNm_ITEM_SWORD: + case fpcNm_ITEM_MASTER_SWORD: + case fpcNm_ITEM_LIGHT_SWORD: changeTextureItemB(mButtonBItem); break; default: @@ -2375,8 +2375,8 @@ void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_pos } } else if (param_1 == true && i_action == 0x4F) { mpScreen->search('item_b_n')->show(); - mButtonBItem = LURE_ROD; - changeTextureItemB(LURE_ROD); + mButtonBItem = fpcNm_ITEM_LURE_ROD; + changeTextureItemB(fpcNm_ITEM_LURE_ROD); var_r31 = 2; } else { mpScreen->search('item_b_n')->hide(); @@ -2483,7 +2483,7 @@ void dMeter2Draw_c::drawButtonS(u8 i_action) { void dMeter2Draw_c::drawButtonBin(u8 i_action) { int bottle_num = 0; for (int i = 0; i < 4; i++) { - if (dComIfGs_getItem((u8)(SLOT_11 + i), true) != NO_ITEM) { + if (dComIfGs_getItem((u8)(SLOT_11 + i), true) != fpcNm_ITEM_NONE) { bottle_num++; } } @@ -2558,7 +2558,7 @@ void dMeter2Draw_c::drawButtonXY(int i_no, u8 i_itemNo, u8 i_action, bool param_ mpTextXY[i_no]->hide(); int var_r29; - if (i_itemNo == NO_ITEM || i_itemNo == 0) { + if (i_itemNo == fpcNm_ITEM_NONE || i_itemNo == 0) { mpScreen->search(tag[i_no])->hide(); var_r29 = 1; } else { @@ -3375,10 +3375,10 @@ char* dMeter2Draw_c::getActionString(u8 i_action, u8 i_type, u8* param_2) { /* 8021A468-8021A71C 214DA8 02B4+00 2/2 0/0 0/0 .text changeTextureItemB__13dMeter2Draw_cFUc */ void dMeter2Draw_c::changeTextureItemB(u8 i_itemNo) { int var_r31 = 0; - if (i_itemNo == LURE_ROD) { + if (i_itemNo == fpcNm_ITEM_LURE_ROD) { var_r31 = 2; - } else if (i_itemNo == SWORD || i_itemNo == MASTER_SWORD || i_itemNo == WOOD_STICK || - i_itemNo == LIGHT_SWORD) + } else if (i_itemNo == fpcNm_ITEM_SWORD || i_itemNo == fpcNm_ITEM_MASTER_SWORD || i_itemNo == fpcNm_ITEM_WOOD_STICK || + i_itemNo == fpcNm_ITEM_LIGHT_SWORD) { var_r31 = 1; } @@ -3421,8 +3421,8 @@ void dMeter2Draw_c::changeTextureItemB(u8 i_itemNo) { void dMeter2Draw_c::changeTextureItemXY(int i_no, u8 i_itemNo) { JUT_ASSERT(i_no < SELECT_MAX_e); - if (i_itemNo == LIGHT_ARROW) { - i_itemNo = BOW; + if (i_itemNo == fpcNm_ITEM_LIGHT_ARROW) { + i_itemNo = fpcNm_ITEM_BOW; } if (field_0x76c[i_no] == 0) { @@ -3625,7 +3625,7 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) { mItemParams[SELECT_X_e].num_scale = g_drawHIO.mXItemNumScale; } else { switch (i_itemNo) { - case BOOMERANG: + case fpcNm_ITEM_BOOMERANG: mItemParams[SELECT_X_e].pos_x = 4.0f; mItemParams[SELECT_X_e].pos_y = -11.0f; mItemParams[SELECT_X_e].scale = 1.7f; @@ -3634,7 +3634,7 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) { mItemParams[SELECT_X_e].num_pos_y = -9.2f; mItemParams[SELECT_X_e].num_scale = 0.95f; break; - case BOW: + case fpcNm_ITEM_BOW: mItemParams[SELECT_X_e].pos_x = 9.2f; mItemParams[SELECT_X_e].pos_y = -14.0f; mItemParams[SELECT_X_e].scale = 2.0f; @@ -3643,7 +3643,7 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) { mItemParams[SELECT_X_e].num_pos_y = -9.2f; mItemParams[SELECT_X_e].num_scale = 0.95f; break; - case HVY_BOOTS: + case fpcNm_ITEM_HVY_BOOTS: mItemParams[SELECT_X_e].pos_x = 4.0f; mItemParams[SELECT_X_e].pos_y = -14.0f; mItemParams[SELECT_X_e].scale = 1.7f; @@ -3652,7 +3652,7 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) { mItemParams[SELECT_X_e].num_pos_y = -9.2f; mItemParams[SELECT_X_e].num_scale = 0.95f; break; - case HOOKSHOT: + case fpcNm_ITEM_HOOKSHOT: mItemParams[SELECT_X_e].pos_x = 17.0f; mItemParams[SELECT_X_e].pos_y = -14.0f; mItemParams[SELECT_X_e].scale = 1.5f; @@ -3661,7 +3661,7 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) { mItemParams[SELECT_X_e].num_pos_y = -9.2f; mItemParams[SELECT_X_e].num_scale = 0.95f; break; - case KANTERA: + case fpcNm_ITEM_KANTERA: mItemParams[SELECT_X_e].pos_x = -2.0f; mItemParams[SELECT_X_e].pos_y = -15.0f; mItemParams[SELECT_X_e].scale = g_drawHIO.mButtonXItemScale; @@ -3706,7 +3706,7 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) { mItemParams[SELECT_Y_e].num_scale = g_drawHIO.mYItemNumScale; } else { switch (i_itemNo) { - case BOOMERANG: + case fpcNm_ITEM_BOOMERANG: mItemParams[SELECT_Y_e].pos_x = 14.0f; mItemParams[SELECT_Y_e].pos_y = 1.3f; mItemParams[SELECT_Y_e].scale = 1.7f; @@ -3715,7 +3715,7 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) { mItemParams[SELECT_Y_e].num_pos_y = -9.2f; mItemParams[SELECT_Y_e].num_scale = 0.95f; break; - case BOW: + case fpcNm_ITEM_BOW: mItemParams[SELECT_Y_e].pos_x = -1.3f; mItemParams[SELECT_Y_e].pos_y = -6.6f; mItemParams[SELECT_Y_e].scale = 2.0f; @@ -3724,7 +3724,7 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) { mItemParams[SELECT_Y_e].num_pos_y = -9.2f; mItemParams[SELECT_Y_e].num_scale = 0.95f; break; - case HVY_BOOTS: + case fpcNm_ITEM_HVY_BOOTS: mItemParams[SELECT_Y_e].pos_x = 1.3f; mItemParams[SELECT_Y_e].pos_y = 1.3f; mItemParams[SELECT_Y_e].scale = 1.7f; @@ -3733,7 +3733,7 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) { mItemParams[SELECT_Y_e].num_pos_y = -9.2f; mItemParams[SELECT_Y_e].num_scale = 0.95f; break; - case HOOKSHOT: + case fpcNm_ITEM_HOOKSHOT: mItemParams[SELECT_Y_e].pos_x = 6.6f; mItemParams[SELECT_Y_e].pos_y = -4.0f; mItemParams[SELECT_Y_e].scale = 1.5f; @@ -3742,7 +3742,7 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) { mItemParams[SELECT_Y_e].num_pos_y = -9.2f; mItemParams[SELECT_Y_e].num_scale = 0.95f; break; - case KANTERA: + case fpcNm_ITEM_KANTERA: mItemParams[SELECT_Y_e].pos_x = -1.8f; mItemParams[SELECT_Y_e].pos_y = g_drawHIO.mButtonYItemPosY; mItemParams[SELECT_Y_e].scale = g_drawHIO.mButtonYItemScale; @@ -3787,7 +3787,7 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) { mItemParams[SELECT_Z_e].num_scale = g_drawHIO.field_0x218; } else { switch (i_itemNo) { - case BOOMERANG: + case fpcNm_ITEM_BOOMERANG: mItemParams[SELECT_Z_e].pos_x = 4.0f; mItemParams[SELECT_Z_e].pos_y = 1.3f; mItemParams[SELECT_Z_e].scale = 2.2f; @@ -3796,7 +3796,7 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) { mItemParams[SELECT_Z_e].num_pos_y = -30.0f; mItemParams[SELECT_Z_e].num_scale = 0.75f; break; - case BOW: + case fpcNm_ITEM_BOW: mItemParams[SELECT_Z_e].pos_x = -1.3f; mItemParams[SELECT_Z_e].pos_y = 1.3f; mItemParams[SELECT_Z_e].scale = 2.2f; @@ -3805,7 +3805,7 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) { mItemParams[SELECT_Z_e].num_pos_y = -30.0f; mItemParams[SELECT_Z_e].num_scale = 0.75f; break; - case HVY_BOOTS: + case fpcNm_ITEM_HVY_BOOTS: mItemParams[SELECT_Z_e].pos_x = -6.6f; mItemParams[SELECT_Z_e].pos_y = 9.2f; mItemParams[SELECT_Z_e].scale = 2.2f; @@ -3814,7 +3814,7 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) { mItemParams[SELECT_Z_e].num_pos_y = -30.0f; mItemParams[SELECT_Z_e].num_scale = 0.8f; break; - case HOOKSHOT: + case fpcNm_ITEM_HOOKSHOT: mItemParams[SELECT_Z_e].pos_x = -4.0f; mItemParams[SELECT_Z_e].pos_y = 1.3f; mItemParams[SELECT_Z_e].scale = 1.7f; @@ -3823,7 +3823,7 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) { mItemParams[SELECT_Z_e].num_pos_y = -30.0f; mItemParams[SELECT_Z_e].num_scale = 0.8f; break; - case KANTERA: + case fpcNm_ITEM_KANTERA: mItemParams[SELECT_Z_e].pos_x = -6.6f; mItemParams[SELECT_Z_e].pos_y = 6.6f; mItemParams[SELECT_Z_e].scale = g_drawHIO.field_0x1d4; @@ -3877,13 +3877,13 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_scale = 0.75f; } else { switch (i_itemNo) { - case LURE_ROD: - case BEE_ROD: - case JEWEL_ROD: - case JEWEL_BEE_ROD: - case JEWEL_WORM_ROD: - case HORSE_FLUTE: - case FISHING_ROD_1: + case fpcNm_ITEM_LURE_ROD: + case fpcNm_ITEM_BEE_ROD: + case fpcNm_ITEM_JEWEL_ROD: + case fpcNm_ITEM_JEWEL_BEE_ROD: + case fpcNm_ITEM_JEWEL_WORM_ROD: + case fpcNm_ITEM_HORSE_FLUTE: + case fpcNm_ITEM_FISHING_ROD_1: mItemParams[3].pos_x = 17.3f; mItemParams[3].pos_y = -46.8f; mItemParams[3].scale = 1.7f; @@ -3892,7 +3892,7 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_pos_y = -30.0f; mItemParams[3].num_scale = 0.75f; break; - case BOOMERANG: + case fpcNm_ITEM_BOOMERANG: mItemParams[3].pos_x = 26.0f; mItemParams[3].pos_y = -54.7f; mItemParams[3].scale = 2.2f; @@ -3901,7 +3901,7 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_pos_y = -30.0f; mItemParams[3].num_scale = 0.75f; break; - case BOW: + case fpcNm_ITEM_BOW: mItemParams[3].pos_x = 20.7f; mItemParams[3].pos_y = -55.7f; mItemParams[3].scale = 2.2f; @@ -3910,7 +3910,7 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_pos_y = -30.0f; mItemParams[3].num_scale = 0.75f; break; - case HVY_BOOTS: + case fpcNm_ITEM_HVY_BOOTS: mItemParams[3].pos_x = 15.4f; mItemParams[3].pos_y = -47.8f; mItemParams[3].scale = 2.2f; @@ -3919,8 +3919,8 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_pos_y = -30.0f; mItemParams[3].num_scale = 0.8f; break; - case SPINNER: - case HAWK_EYE: + case fpcNm_ITEM_SPINNER: + case fpcNm_ITEM_HAWK_EYE: mItemParams[3].pos_x = 23.3f; mItemParams[3].pos_y = -47.8f; mItemParams[3].scale = 1.7f; @@ -3929,9 +3929,9 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_pos_y = -30.0f; mItemParams[3].num_scale = 0.8f; break; - case COPY_ROD: - case W_HOOKSHOT: - case IRONBALL: + case fpcNm_ITEM_COPY_ROD: + case fpcNm_ITEM_W_HOOKSHOT: + case fpcNm_ITEM_IRONBALL: mItemParams[3].pos_x = 29.3f; mItemParams[3].pos_y = -47.8f; mItemParams[3].scale = 1.7f; @@ -3940,13 +3940,13 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_pos_y = -30.0f; mItemParams[3].num_scale = 0.8f; break; - case PACHINKO: - case BOMB_BAG_LV1: - case NORMAL_BOMB: - case WATER_BOMB: - case POKE_BOMB: - case RAFRELS_MEMO: - case TKS_LETTER: + case fpcNm_ITEM_PACHINKO: + case fpcNm_ITEM_BOMB_BAG_LV1: + case fpcNm_ITEM_NORMAL_BOMB: + case fpcNm_ITEM_WATER_BOMB: + case fpcNm_ITEM_POKE_BOMB: + case fpcNm_ITEM_RAFRELS_MEMO: + case fpcNm_ITEM_TKS_LETTER: mItemParams[3].pos_x = 20.3f; mItemParams[3].pos_y = -47.8f; mItemParams[3].scale = 1.7f; @@ -3955,7 +3955,7 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_pos_y = -22.0f; mItemParams[3].num_scale = 0.8f; break; - case HOOKSHOT: + case fpcNm_ITEM_HOOKSHOT: mItemParams[3].pos_x = 21.0f; mItemParams[3].pos_y = -46.7f; mItemParams[3].scale = 1.7f; @@ -3964,7 +3964,7 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_pos_y = -30.0f; mItemParams[3].num_scale = 0.8f; break; - case KANTERA: + case fpcNm_ITEM_KANTERA: mItemParams[3].pos_x = 19.0f; mItemParams[3].pos_y = -45.0f; mItemParams[3].scale = g_drawHIO.mButtonBItemScale[0]; diff --git a/src/d/d_meter2_info.cpp b/src/d/d_meter2_info.cpp index 5a0f666a65..c41102276a 100644 --- a/src/d/d_meter2_info.cpp +++ b/src/d/d_meter2_info.cpp @@ -344,8 +344,8 @@ void dMeter2Info_c::warpInProc() { dComIfGs_setWarpMarkFlag(0); dComIfGs_resetLastWarpAcceptStage(); - if (dComIfGs_getItem(SLOT_18, true) != LV7_DUNGEON_EXIT) { - dComIfGs_setItem(SLOT_18, DUNGEON_EXIT); + if (dComIfGs_getItem(SLOT_18, true) != fpcNm_ITEM_LV7_DUNGEON_EXIT) { + dComIfGs_setItem(SLOT_18, fpcNm_ITEM_DUNGEON_EXIT); } } @@ -379,7 +379,7 @@ void dMeter2Info_c::warpOutProc() { } dComIfGs_setWarpItemData(dComIfGp_getStartStageName(), warpPos, warpAngle.y, warpRoomNo, 0, 1); - dComIfGs_setItem(SLOT_18, DUNGEON_BACK); + dComIfGs_setItem(SLOT_18, fpcNm_ITEM_DUNGEON_BACK); } /* 8021CC00-8021CC0C 217540 000C+00 0/0 1/1 1/1 .text resetMeterString__13dMeter2Info_cFv @@ -496,9 +496,9 @@ int dMeter2Info_c::readItemTexture(u8 itemNo, void* param_1, J2DPicture* param_2 int ret = 0; if (param_1 != NULL) { - if ((itemNo == KANTERA && dComIfGs_getOil() == 0) || itemNo == KANTERA2) { + if ((itemNo == fpcNm_ITEM_KANTERA && dComIfGs_getOil() == 0) || itemNo == fpcNm_ITEM_KANTERA2) { dComIfGp_getItemIconArchive()->readIdxResource(param_1, 0xC00, 0x23); - } else if (itemNo == COPY_ROD && !daPy_getPlayerActorClass()->checkCopyRodTopUse() && + } else if (itemNo == fpcNm_ITEM_COPY_ROD && !daPy_getPlayerActorClass()->checkCopyRodTopUse() && param_9 == -1) { dComIfGp_getItemIconArchive()->readIdxResource(param_1, 0xC00, 0x57); @@ -605,51 +605,51 @@ void dMeter2Info_c::setItemColor(u8 param_1, J2DPicture* param_2, J2DPicture* pa */ s16 dMeter2Info_c::get2ndTexture(u8 itemType) { switch (itemType) { - case GREEN_RUPEE: - case BLUE_RUPEE: - case YELLOW_RUPEE: - case RED_RUPEE: - case PURPLE_RUPEE: - case ORANGE_RUPEE: - case SILVER_RUPEE: + case fpcNm_ITEM_GREEN_RUPEE: + case fpcNm_ITEM_BLUE_RUPEE: + case fpcNm_ITEM_YELLOW_RUPEE: + case fpcNm_ITEM_RED_RUPEE: + case fpcNm_ITEM_PURPLE_RUPEE: + case fpcNm_ITEM_ORANGE_RUPEE: + case fpcNm_ITEM_SILVER_RUPEE: return 0x2e; - case S_MAGIC: - case L_MAGIC: - case BOMB_5: - case BOMB_10: - case BOMB_20: - case BOMB_30: - case ARROW_10: - case ARROW_20: - case ARROW_30: - case ARROW_1: - case PACHINKO_SHOT: - case noentry1: - case noentry2: - case noentry3: - case WATER_BOMB_5: - case WATER_BOMB_10: - case WATER_BOMB_20: - case WATER_BOMB_30: - case BOMB_INSECT_5: - case TRIPLE_HEART: + case fpcNm_ITEM_S_MAGIC: + case fpcNm_ITEM_L_MAGIC: + case fpcNm_ITEM_BOMB_5: + case fpcNm_ITEM_BOMB_10: + case fpcNm_ITEM_BOMB_20: + case fpcNm_ITEM_BOMB_30: + case fpcNm_ITEM_ARROW_10: + case fpcNm_ITEM_ARROW_20: + case fpcNm_ITEM_ARROW_30: + case fpcNm_ITEM_ARROW_1: + case fpcNm_ITEM_PACHINKO_SHOT: + case fpcNm_ITEM_NOENTRY_19: + case fpcNm_ITEM_NOENTRY_20: + case fpcNm_ITEM_NOENTRY_21: + case fpcNm_ITEM_WATER_BOMB_5: + case fpcNm_ITEM_WATER_BOMB_10: + case fpcNm_ITEM_WATER_BOMB_20: + case fpcNm_ITEM_WATER_BOMB_30: + case fpcNm_ITEM_BOMB_INSECT_5: + case fpcNm_ITEM_TRIPLE_HEART: return 0xe; - case BOMB_INSECT_10: + case fpcNm_ITEM_BOMB_INSECT_10: return 0x14; - case BOMB_INSECT_20: + case fpcNm_ITEM_BOMB_INSECT_20: return 0x27; - case BOMB_INSECT_30: + case fpcNm_ITEM_BOMB_INSECT_30: return 0xf; - case RECOVERY_FAILY: + case fpcNm_ITEM_RECOVERY_FAILY: return 0x10; - case KAKERA_HEART: - case UTAWA_HEART: - case MAP: + case fpcNm_ITEM_KAKERA_HEART: + case fpcNm_ITEM_UTAWA_HEART: + case fpcNm_ITEM_MAP: return 0x69; - case COMPUS: + case fpcNm_ITEM_COMPUS: return 0x2a; default: - case SMALL_KEY: + case fpcNm_ITEM_SMALL_KEY: return -1; } } @@ -658,18 +658,18 @@ s16 dMeter2Info_c::get2ndTexture(u8 itemType) { */ s16 dMeter2Info_c::get3rdTexture(u8 itemType) { switch (itemType) { - case GREEN_RUPEE: - case BLUE_RUPEE: - case YELLOW_RUPEE: - case RED_RUPEE: - case PURPLE_RUPEE: - case ORANGE_RUPEE: - case SILVER_RUPEE: + case fpcNm_ITEM_GREEN_RUPEE: + case fpcNm_ITEM_BLUE_RUPEE: + case fpcNm_ITEM_YELLOW_RUPEE: + case fpcNm_ITEM_RED_RUPEE: + case fpcNm_ITEM_PURPLE_RUPEE: + case fpcNm_ITEM_ORANGE_RUPEE: + case fpcNm_ITEM_SILVER_RUPEE: return 0x2e; - case BOMB_INSECT_10: - case BOMB_INSECT_20: - case BOMB_INSECT_30: - case RECOVERY_FAILY: + case fpcNm_ITEM_BOMB_INSECT_10: + case fpcNm_ITEM_BOMB_INSECT_20: + case fpcNm_ITEM_BOMB_INSECT_30: + case fpcNm_ITEM_RECOVERY_FAILY: return 0x0e; default: return -1; @@ -680,13 +680,13 @@ s16 dMeter2Info_c::get3rdTexture(u8 itemType) { */ s16 dMeter2Info_c::get4thTexture(u8 itemType) { switch (itemType) { - case GREEN_RUPEE: - case BLUE_RUPEE: - case YELLOW_RUPEE: - case RED_RUPEE: - case PURPLE_RUPEE: - case ORANGE_RUPEE: - case SILVER_RUPEE: + case fpcNm_ITEM_GREEN_RUPEE: + case fpcNm_ITEM_BLUE_RUPEE: + case fpcNm_ITEM_YELLOW_RUPEE: + case fpcNm_ITEM_RED_RUPEE: + case fpcNm_ITEM_PURPLE_RUPEE: + case fpcNm_ITEM_ORANGE_RUPEE: + case fpcNm_ITEM_SILVER_RUPEE: return 0x2e; default: return -1; @@ -963,8 +963,8 @@ void dMeter2Info_c::changeWater(u8 i_slotNo) { int i_bottleIdx = i_slotNo - SLOT_11; mHotSpringTimer[i_bottleIdx] = 0; - if (dComIfGs_getItem(i_slotNo, true) == HOT_SPRING) { - dComIfGs_setItem(i_slotNo, WATER_BOTTLE); + if (dComIfGs_getItem(i_slotNo, true) == fpcNm_ITEM_HOT_SPRING) { + dComIfGs_setItem(i_slotNo, fpcNm_ITEM_WATER_BOTTLE); for (int i = 0; i < 3; i++) { if (i_slotNo == dComIfGs_getSelectItemIndex(i)) { @@ -987,7 +987,7 @@ void dMeter2Info_c::setMiniGameItem(u8 minigameFlag) { bool setRentBagIdx = false; for (int bagIdx = 0; bagIdx < 3; bagIdx++) { - if (!setRentBagIdx && dComIfGs_getItem((u8)(bagIdx + SLOT_15), true) == NO_ITEM) { + if (!setRentBagIdx && dComIfGs_getItem((u8)(bagIdx + SLOT_15), true) == fpcNm_ITEM_NONE) { mRentalBombBagIdx = bagIdx; setRentBagIdx = true; } @@ -1022,12 +1022,12 @@ void dMeter2Info_c::setMiniGameItem(u8 minigameFlag) { dComIfGs_setArrowNum(mSaveArrowNumMG); } - dComIfGs_setItem((u8)(mRentalBombBagIdx + SLOT_15), NORMAL_BOMB); - dComIfGp_setItem((u8)(mRentalBombBagIdx + SLOT_15), NORMAL_BOMB); + dComIfGs_setItem((u8)(mRentalBombBagIdx + SLOT_15), fpcNm_ITEM_NORMAL_BOMB); + dComIfGp_setItem((u8)(mRentalBombBagIdx + SLOT_15), fpcNm_ITEM_NORMAL_BOMB); if (mMiniGameItemSetFlag != 3) { - dComIfGs_setItem(SLOT_4, BOW); - dComIfGp_setItem(SLOT_4, BOW); + dComIfGs_setItem(SLOT_4, fpcNm_ITEM_BOW); + dComIfGp_setItem(SLOT_4, fpcNm_ITEM_BOW); dComIfGs_setMixItemIndex(SELECT_ITEM_Y, 0xFF); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, 0xFF); dComIfGs_setMixItemIndex(SELECT_ITEM_X, SLOT_4); @@ -1131,17 +1131,17 @@ bool dMeter2Info_getPixel(f32 param_0, f32 param_1, f32 param_2, f32 param_3, f3 /* 8021E4B0-8021E530 218DF0 0080+00 0/0 2/2 1/1 .text dMeter2Info_setCloth__FUcb */ void dMeter2Info_setCloth(u8 i_clothId, bool param_1) { switch (i_clothId) { - case WEAR_CASUAL: - case WEAR_KOKIRI: - case ARMOR: - case WEAR_ZORA: + case fpcNm_ITEM_WEAR_CASUAL: + case fpcNm_ITEM_WEAR_KOKIRI: + case fpcNm_ITEM_ARMOR: + case fpcNm_ITEM_WEAR_ZORA: break; default: - i_clothId = WEAR_CASUAL; + i_clothId = fpcNm_ITEM_WEAR_CASUAL; param_1 = false; } - if (param_1 && dComIfGs_getSelectEquipClothes() != NO_ITEM) { + if (param_1 && dComIfGs_getSelectEquipClothes() != fpcNm_ITEM_NONE) { u8 equip_cloth = dComIfGs_getSelectEquipClothes(); dComIfGs_offItemFirstBit(equip_cloth); } @@ -1152,14 +1152,14 @@ void dMeter2Info_setCloth(u8 i_clothId, bool param_1) { /* 8021E530-8021E5D4 218E70 00A4+00 0/0 3/3 3/3 .text dMeter2Info_setSword__FUcb */ void dMeter2Info_setSword(u8 i_itemId, bool param_1) { switch (i_itemId) { - case NO_ITEM: - case WOOD_STICK: - case SWORD: - case MASTER_SWORD: - case LIGHT_SWORD: + case fpcNm_ITEM_NONE: + case fpcNm_ITEM_WOOD_STICK: + case fpcNm_ITEM_SWORD: + case fpcNm_ITEM_MASTER_SWORD: + case fpcNm_ITEM_LIGHT_SWORD: break; default: - i_itemId = NO_ITEM; + i_itemId = fpcNm_ITEM_NONE; param_1 = false; } @@ -1174,13 +1174,13 @@ void dMeter2Info_setSword(u8 i_itemId, bool param_1) { /* 8021E5D4-8021E660 218F14 008C+00 0/0 3/3 0/0 .text dMeter2Info_setShield__FUcb */ void dMeter2Info_setShield(u8 i_itemId, bool param_1) { switch (i_itemId) { - case NO_ITEM: - case WOOD_SHIELD: - case SHIELD: - case HYLIA_SHIELD: + case fpcNm_ITEM_NONE: + case fpcNm_ITEM_WOOD_SHIELD: + case fpcNm_ITEM_SHIELD: + case fpcNm_ITEM_HYLIA_SHIELD: break; default: - i_itemId = NO_ITEM; + i_itemId = fpcNm_ITEM_NONE; param_1 = false; } diff --git a/src/d/d_meter_HIO.cpp b/src/d/d_meter_HIO.cpp index b2f87425b7..48739f3c65 100644 --- a/src/d/d_meter_HIO.cpp +++ b/src/d/d_meter_HIO.cpp @@ -1311,7 +1311,7 @@ dMeter_mapIconHIO_c::dMeter_mapIconHIO_c() { mCannonBallZoomScale[1] = 0.8f; mLV5DungeonItemDebug = false; - mLV5DungeonItem = NO_ITEM; + mLV5DungeonItem = fpcNm_ITEM_NONE; mIconDebug = false; for (int i = 0; i < ARRAY_SIZE(mIconDisplay); i++) { @@ -1554,4 +1554,4 @@ dMeter_ringHIO_c g_ringHIO; dMeter_fmapHIO_c g_fmapHIO; /* 80430110-80430158 05CE30 0044+04 0/1 6/6 1/1 .bss g_cursorHIO */ -dMeter_cursorHIO_c g_cursorHIO; \ No newline at end of file +dMeter_cursorHIO_c g_cursorHIO; diff --git a/src/d/d_meter_button.cpp b/src/d/d_meter_button.cpp index c9b3788c30..87d1ce02c8 100644 --- a/src/d/d_meter_button.cpp +++ b/src/d/d_meter_button.cpp @@ -1178,11 +1178,11 @@ void dMeterButton_c::screenInitButton() { u8 fishing_item = dComIfGs_getItem(SLOT_20, false); if (dMeter2Info_getMeterClass()->getMeterDrawPtr()->getCanoeFishing()) { - fishing_item = LURE_ROD; + fishing_item = fpcNm_ITEM_LURE_ROD; } - if (fishing_item == NO_ITEM) { - fishing_item = FISHING_ROD_1; + if (fishing_item == fpcNm_ITEM_NONE) { + fishing_item = fpcNm_ITEM_FISHING_ROD_1; } dMeter2Info_readItemTexture(fishing_item, mpFishingTex, @@ -3368,4 +3368,4 @@ void dMeterButton_c::pikariCheck() { */ void dMeterButton_c::paneTrans(CPaneMgr* i_pane, f32 i_transX, f32 i_transY, u8 unused) { i_pane->paneTrans(i_transX, i_transY); -} \ No newline at end of file +} diff --git a/src/d/d_msg_class.cpp b/src/d/d_msg_class.cpp index 87418bc7b8..f7171e1f5e 100644 --- a/src/d/d_msg_class.cpp +++ b/src/d/d_msg_class.cpp @@ -1646,12 +1646,12 @@ bool jmessage_tMeasureProcessor::do_tag(u32 i_tag, void const* i_data, u32 i_siz push_word(bomb_price_text); return true; case 0x37: - u8 bomb_type = NORMAL_BOMB; + u8 bomb_type = fpcNm_ITEM_NORMAL_BOMB; if (*(u8*)i_data == 1) { - bomb_type = WATER_BOMB; + bomb_type = fpcNm_ITEM_WATER_BOMB; } else if (*(u8*)i_data == 2) { - bomb_type = POKE_BOMB; + bomb_type = fpcNm_ITEM_POKE_BOMB; } char bomb_max_text[40]; @@ -3877,4 +3877,4 @@ SECTION_DATA extern void* __vt__19jmessage_tReference[4 + 1 /* padding */] = { NULL, }; -/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80399610-80399610 025C70 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_msg_flow.cpp b/src/d/d_msg_flow.cpp index 18daf67568..e77a2ab111 100644 --- a/src/d/d_msg_flow.cpp +++ b/src/d/d_msg_flow.cpp @@ -919,7 +919,7 @@ int dMsgFlow_c::query022(mesg_flow_node_branch* flow_node, fopAc_ac_c*, int) { /* 8024B918-8024B954 246258 003C+00 1/0 0/0 0/0 .text * query023__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ int dMsgFlow_c::query023(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { - return (u16)(3 - dComIfGs_checkBombBag(NO_ITEM)); + return (u16)(3 - dComIfGs_checkBombBag(fpcNm_ITEM_NONE)); } /* 8024B954-8024B974 246294 0020+00 1/0 0/0 0/0 .text @@ -1087,7 +1087,7 @@ int dMsgFlow_c::query039(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, in u16 uVar2 = *(u16*)param_0->params; u8 iVar4 = dComIfGs_getTmpReg(0xfbff); u8 bombNum = dComIfGs_getBombNum(iVar4 - 1); - return dComIfGs_getBombMax(NORMAL_BOMB) >= bombNum + uVar2; + return dComIfGs_getBombMax(fpcNm_ITEM_NORMAL_BOMB) >= bombNum + uVar2; } /* 8024BE4C-8024BF50 24678C 0104+00 1/0 0/0 0/0 .text @@ -1125,7 +1125,7 @@ int dMsgFlow_c::query041(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, in u16 uVar2 = *(u16*)param_0->params; u8 iVar4 = dComIfGs_getTmpReg(0xfbff); u8 bombNum = dComIfGs_getBombNum(iVar4 - 1); - return dComIfGs_getBombMax(WATER_BOMB) >= bombNum + uVar2; + return dComIfGs_getBombMax(fpcNm_ITEM_WATER_BOMB) >= bombNum + uVar2; } /* 8024BFEC-8024C0A8 24692C 00BC+00 1/0 0/0 0/0 .text @@ -1152,7 +1152,7 @@ int dMsgFlow_c::query042(mesg_flow_node_branch*, fopAc_ac_c*, int) { int dMsgFlow_c::query043(mesg_flow_node_branch* flow_node, fopAc_ac_c*, int) { u16 prm0 = flow_node->params[0]; u8 bomb_num = dComIfGs_getBombNum(dComIfGs_getTmpReg(0xFBFF) - 1); - u8 bomb_max = dComIfGs_getBombMax(POKE_BOMB); + u8 bomb_max = dComIfGs_getBombMax(fpcNm_ITEM_POKE_BOMB); return bomb_max >= bomb_num + prm0; } @@ -1546,15 +1546,15 @@ int dMsgFlow_c::event017(mesg_flow_node_event* flow_node, fopAc_ac_c*) { if (prm1 <= 1) { switch (prm0) { - case DROP_CONTAINER: + case fpcNm_ITEM_DROP_CONTAINER: dMeter2Info_setLightDropGetFlag(0, 1); dComIfGs_onLightDropGetFlag(0); break; - case DROP_CONTAINER02: + case fpcNm_ITEM_DROP_CONTAINER02: dMeter2Info_setLightDropGetFlag(1, 1); dComIfGs_onLightDropGetFlag(1); break; - case DROP_CONTAINER03: + case fpcNm_ITEM_DROP_CONTAINER03: dMeter2Info_setLightDropGetFlag(2, 1); dComIfGs_onLightDropGetFlag(2); break; @@ -1654,25 +1654,25 @@ int dMsgFlow_c::event023(mesg_flow_node_event* flow_node, fopAc_ac_c*) { switch (prm0) { case 1: - dComIfGs_setEmptyBottleItemIn(RED_BOTTLE); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_RED_BOTTLE); break; case 2: - dComIfGs_setEmptyBottleItemIn(GREEN_BOTTLE); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_GREEN_BOTTLE); break; case 3: - dComIfGs_setEmptyBottleItemIn(BLUE_BOTTLE); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_BLUE_BOTTLE); break; case 4: - dComIfGs_setEmptyBottleItemIn(MILK_BOTTLE); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_MILK_BOTTLE); break; case 5: - dComIfGs_setEmptyBottleItemIn(HALF_MILK_BOTTLE); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_HALF_MILK_BOTTLE); break; case 6: - dComIfGs_setEmptyBottleItemIn(OIL_BOTTLE); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_OIL_BOTTLE); break; case 7: - dComIfGs_setEmptyBottleItemIn(HOT_SPRING); + dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_HOT_SPRING); break; } @@ -1741,36 +1741,36 @@ int dMsgFlow_c::event027(mesg_flow_node_event* flow_node, fopAc_ac_c*) { switch (aParam8[1]) { case 0: - if (dComIfGs_getItem((u8)(SLOT_15 + slot), false) == BOMB_BAG_LV1) { - dComIfGs_setItem((u8)(SLOT_15 + slot), NORMAL_BOMB); + if (dComIfGs_getItem((u8)(SLOT_15 + slot), false) == fpcNm_ITEM_BOMB_BAG_LV1) { + dComIfGs_setItem((u8)(SLOT_15 + slot), fpcNm_ITEM_NORMAL_BOMB); } if (prm1 != 0) { dComIfGp_setItemBombNumCount(slot, (u8)prm1); } else { - dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(NORMAL_BOMB)); + dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(fpcNm_ITEM_NORMAL_BOMB)); } break; case 1: - if (dComIfGs_getItem((u8)(SLOT_15 + slot), false) == BOMB_BAG_LV1) { - dComIfGs_setItem((u8)(SLOT_15 + slot), WATER_BOMB); + if (dComIfGs_getItem((u8)(SLOT_15 + slot), false) == fpcNm_ITEM_BOMB_BAG_LV1) { + dComIfGs_setItem((u8)(SLOT_15 + slot), fpcNm_ITEM_WATER_BOMB); } if (prm1 != 0) { dComIfGp_setItemBombNumCount(slot, (u8)prm1); } else { - dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(WATER_BOMB)); + dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(fpcNm_ITEM_WATER_BOMB)); } break; case 2: - if (dComIfGs_getItem((u8)(SLOT_15 + slot), false) == BOMB_BAG_LV1) { - dComIfGs_setItem((u8)(SLOT_15 + slot), POKE_BOMB); + if (dComIfGs_getItem((u8)(SLOT_15 + slot), false) == fpcNm_ITEM_BOMB_BAG_LV1) { + dComIfGs_setItem((u8)(SLOT_15 + slot), fpcNm_ITEM_POKE_BOMB); } if (prm1 != 0) { dComIfGp_setItemBombNumCount(slot, (u8)prm1); } else { - dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(POKE_BOMB)); + dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(fpcNm_ITEM_POKE_BOMB)); } break; case 3: @@ -1780,16 +1780,16 @@ int dMsgFlow_c::event027(mesg_flow_node_event* flow_node, fopAc_ac_c*) { dComIfGp_setItemBombNumCount(slot, (u8)prm1); break; case 6: - dComIfGs_setItem((u8)(SLOT_15 + slot), NORMAL_BOMB); - dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(NORMAL_BOMB)); + dComIfGs_setItem((u8)(SLOT_15 + slot), fpcNm_ITEM_NORMAL_BOMB); + dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(fpcNm_ITEM_NORMAL_BOMB)); break; case 7: - dComIfGs_setItem((u8)(SLOT_15 + slot), WATER_BOMB); - dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(WATER_BOMB)); + dComIfGs_setItem((u8)(SLOT_15 + slot), fpcNm_ITEM_WATER_BOMB); + dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(fpcNm_ITEM_WATER_BOMB)); break; case 8: - dComIfGs_setItem((u8)(SLOT_15 + slot), POKE_BOMB); - dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(POKE_BOMB)); + dComIfGs_setItem((u8)(SLOT_15 + slot), fpcNm_ITEM_POKE_BOMB); + dComIfGp_setItemBombNumCount(slot, dComIfGs_getBombMax(fpcNm_ITEM_POKE_BOMB)); break; case 9: case 10: @@ -1812,8 +1812,8 @@ int dMsgFlow_c::event028(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { dComIfGp_setItemRupeeCount(bombPrice); dComIfGs_setBombNum(bagID, 0); - if (dComIfGs_getItem((u8)(SLOT_15 + bagID), true) != BOMB_ARROW) { - dComIfGs_setItem((u8)(SLOT_15 + bagID), BOMB_BAG_LV1); + if (dComIfGs_getItem((u8)(SLOT_15 + bagID), true) != fpcNm_ITEM_BOMB_ARROW) { + dComIfGs_setItem((u8)(SLOT_15 + bagID), fpcNm_ITEM_BOMB_BAG_LV1); } else { for (int i = 0; i < 3; i++) { u8 select_item = dComIfGs_getSelectItemIndex(i); @@ -1821,12 +1821,12 @@ int dMsgFlow_c::event028(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { if (SLOT_15 + bagID == select_item) { u8 mix_item = dComIfGs_getMixItemIndex(i); - dComIfGs_setMixItemIndex(i, NO_ITEM); + dComIfGs_setMixItemIndex(i, fpcNm_ITEM_NONE); dComIfGs_setSelectItemIndex(i, mix_item); dComIfGp_setSelectItem(i); } } - dComIfGs_setItem((u8)(SLOT_15 + bagID), BOMB_BAG_LV1); + dComIfGs_setItem((u8)(SLOT_15 + bagID), fpcNm_ITEM_BOMB_BAG_LV1); } return 1; @@ -1930,12 +1930,12 @@ int dMsgFlow_c::event034(mesg_flow_node_event* flow_node, fopAc_ac_c*) { int dMsgFlow_c::event035(mesg_flow_node_event* flow_node, fopAc_ac_c*) { int prm0 = getParam(flow_node->params); - if (prm0 == TOMATO_PUREE || prm0 == TASTE) { + if (prm0 == fpcNm_ITEM_TOMATO_PUREE || prm0 == fpcNm_ITEM_TASTE) { dComIfGs_offItemFirstBit(prm0); - } else if (prm0 == RAFRELS_MEMO || prm0 == ASHS_SCRIBBLING) { - dComIfGs_setItem(SLOT_19, NO_ITEM); - } else if (prm0 == LETTER || prm0 == BILL || prm0 == WOOD_STATUE || prm0 == IRIAS_PENDANT) { - dComIfGs_setWarashibeItem(NO_ITEM); + } else if (prm0 == fpcNm_ITEM_RAFRELS_MEMO || prm0 == fpcNm_ITEM_ASHS_SCRIBBLING) { + dComIfGs_setItem(SLOT_19, fpcNm_ITEM_NONE); + } else if (prm0 == fpcNm_ITEM_LETTER || prm0 == fpcNm_ITEM_BILL || prm0 == fpcNm_ITEM_WOOD_STATUE || prm0 == fpcNm_ITEM_IRIAS_PENDANT) { + dComIfGs_setWarashibeItem(fpcNm_ITEM_NONE); } return 1; @@ -1986,25 +1986,25 @@ int dMsgFlow_c::event040(mesg_flow_node_event* flow_node, fopAc_ac_c*) { case 0: break; case 1: - dComIfGs_setBottleItemIn(RED_BOTTLE, EMPTY_BOTTLE); + dComIfGs_setBottleItemIn(fpcNm_ITEM_RED_BOTTLE, fpcNm_ITEM_EMPTY_BOTTLE); break; case 2: - dComIfGs_setBottleItemIn(GREEN_BOTTLE, EMPTY_BOTTLE); + dComIfGs_setBottleItemIn(fpcNm_ITEM_GREEN_BOTTLE, fpcNm_ITEM_EMPTY_BOTTLE); break; case 3: - dComIfGs_setBottleItemIn(BLUE_BOTTLE, EMPTY_BOTTLE); + dComIfGs_setBottleItemIn(fpcNm_ITEM_BLUE_BOTTLE, fpcNm_ITEM_EMPTY_BOTTLE); break; case 4: - dComIfGs_setBottleItemIn(MILK_BOTTLE, EMPTY_BOTTLE); + dComIfGs_setBottleItemIn(fpcNm_ITEM_MILK_BOTTLE, fpcNm_ITEM_EMPTY_BOTTLE); break; case 5: - dComIfGs_setBottleItemIn(HALF_MILK_BOTTLE, EMPTY_BOTTLE); + dComIfGs_setBottleItemIn(fpcNm_ITEM_HALF_MILK_BOTTLE, fpcNm_ITEM_EMPTY_BOTTLE); break; case 6: - dComIfGs_setBottleItemIn(OIL_BOTTLE, EMPTY_BOTTLE); + dComIfGs_setBottleItemIn(fpcNm_ITEM_OIL_BOTTLE, fpcNm_ITEM_EMPTY_BOTTLE); break; case 7: - dComIfGs_setBottleItemIn(HOT_SPRING, EMPTY_BOTTLE); + dComIfGs_setBottleItemIn(fpcNm_ITEM_HOT_SPRING, fpcNm_ITEM_EMPTY_BOTTLE); break; } diff --git a/src/d/d_msg_object.cpp b/src/d/d_msg_object.cpp index 32e34e243f..ab6560bab8 100644 --- a/src/d/d_msg_object.cpp +++ b/src/d/d_msg_object.cpp @@ -2223,7 +2223,7 @@ void dMsgObject_c::setDemoMessageLocal(u32 param_1) { u16 dMsgObject_c::getSmellTypeMessageIDLocal() { u16 msgId = 0; int smell = dComIfGs_getCollectSmell(); - if (smell < SMELL_MEDICINE + 1 && smell >= SMELL_YELIA_POUCH) { + if (smell < fpcNm_ITEM_SMELL_MEDICINE + 1 && smell >= fpcNm_ITEM_SMELL_YELIA_POUCH) { msgId = smell + 0x165; } else { if (dComIfGs_getCollectSmell() != -1) { diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp index 2ae035c5fa..8d19ccbbc3 100644 --- a/src/d/d_s_name.cpp +++ b/src/d/d_s_name.cpp @@ -251,13 +251,13 @@ void dScnName_c::brightCheck() { field_0x41f = 0; field_0x41d = 5; - dComIfGs_offItemFirstBit(GREEN_RUPEE); - dComIfGs_offItemFirstBit(BLUE_RUPEE); - dComIfGs_offItemFirstBit(YELLOW_RUPEE); - dComIfGs_offItemFirstBit(RED_RUPEE); - dComIfGs_offItemFirstBit(PURPLE_RUPEE); - dComIfGs_offItemFirstBit(ORANGE_RUPEE); - dComIfGs_offItemFirstBit(SILVER_RUPEE); + dComIfGs_offItemFirstBit(fpcNm_ITEM_GREEN_RUPEE); + dComIfGs_offItemFirstBit(fpcNm_ITEM_BLUE_RUPEE); + dComIfGs_offItemFirstBit(fpcNm_ITEM_YELLOW_RUPEE); + dComIfGs_offItemFirstBit(fpcNm_ITEM_RED_RUPEE); + dComIfGs_offItemFirstBit(fpcNm_ITEM_PURPLE_RUPEE); + dComIfGs_offItemFirstBit(fpcNm_ITEM_ORANGE_RUPEE); + dComIfGs_offItemFirstBit(fpcNm_ITEM_SILVER_RUPEE); } } diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 72faf7937f..6c2da292c1 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -394,7 +394,7 @@ static int phase_1(dScnPly_c* i_this) { dComIfGp_getStartStagePoint() == 3) { dComIfGs_onDarkClearLV(0); - execItemGet(WEAR_KOKIRI); + execItemGet(fpcNm_ITEM_WEAR_KOKIRI); } // Stage: Kakariko Village, Room: Kakariko Village else if (!strcmp(dComIfGp_getStartStageName(), "F_SP109") && @@ -419,8 +419,8 @@ static int phase_1(dScnPly_c* i_this) { if (!strcmp(dComIfGp_getStartStageName(), "F_SP104") && dComIfGp_getStartStageRoomNo() == 1 && dComIfGp_getStartStagePoint() == 23 && dComIfGp_getStartStageLayer() == 12) { - dComIfGs_onItemFirstBit(HORSE_FLUTE); - dComIfGs_setItem(SLOT_21, HORSE_FLUTE); + dComIfGs_onItemFirstBit(fpcNm_ITEM_HORSE_FLUTE); + dComIfGs_setItem(SLOT_21, fpcNm_ITEM_HORSE_FLUTE); } if ((u8)dKy_darkworld_stage_check(dComIfGp_getStartStageName(), @@ -616,9 +616,9 @@ static int phase_4(dScnPly_c* i_this) { dComIfGs_init(); dComIfGs_setOptPointer(0); dComIfGs_setLife(12); - dMeter2Info_setCloth(WEAR_KOKIRI, false); - dMeter2Info_setSword(SWORD, false); - dMeter2Info_setShield(HYLIA_SHIELD, false); + dMeter2Info_setCloth(fpcNm_ITEM_WEAR_KOKIRI, false); + dMeter2Info_setSword(fpcNm_ITEM_SWORD, false); + dMeter2Info_setShield(fpcNm_ITEM_HYLIA_SHIELD, false); dComIfGs_onEventBit(0x0601); // Epona Tamed } diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index 78e00c8b18..1884c81de7 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -13,12 +13,12 @@ /* 80032918-80032958 02D258 0040+00 4/4 0/0 0/0 .text dSv_item_rename__FUc */ static u8 dSv_item_rename(u8 i_itemNo) { switch (i_itemNo) { - case OIL_BOTTLE_2: - return OIL_BOTTLE; - case RED_BOTTLE_2: - return RED_BOTTLE; - case OIL2: - return OIL; + case fpcNm_ITEM_OIL_BOTTLE_2: + return fpcNm_ITEM_OIL_BOTTLE; + case fpcNm_ITEM_RED_BOTTLE_2: + return fpcNm_ITEM_RED_BOTTLE; + case fpcNm_ITEM_OIL2: + return fpcNm_ITEM_OIL; default: return i_itemNo; } @@ -43,11 +43,11 @@ void dSv_player_status_a_c::init() { mSelectEquip[i] = 0; } - mSelectEquip[COLLECT_CLOTHING] = WEAR_CASUAL; - mSelectEquip[COLLECT_SWORD] = NO_ITEM; - mSelectEquip[COLLECT_SHIELD] = NO_ITEM; - mSelectEquip[COLLECT_SMELL] = NO_ITEM; - mSelectEquip[B_BUTTON_ITEM] = NO_ITEM; + mSelectEquip[COLLECT_CLOTHING] = fpcNm_ITEM_WEAR_CASUAL; + mSelectEquip[COLLECT_SWORD] = fpcNm_ITEM_NONE; + mSelectEquip[COLLECT_SHIELD] = fpcNm_ITEM_NONE; + mSelectEquip[COLLECT_SMELL] = fpcNm_ITEM_NONE; + mSelectEquip[B_BUTTON_ITEM] = fpcNm_ITEM_NONE; mWalletSize = WALLET; mMaxMagic = 0; mMagic = 0; @@ -257,8 +257,8 @@ void dSv_player_last_mark_info_c::setWarpItemData(const char* i_name, const cXyz /* 80032F90-80032FB8 02D8D0 0028+00 1/1 0/0 0/0 .text init__17dSv_player_item_cFv */ void dSv_player_item_c::init() { for (int i = 0; i < MAX_ITEM_SLOTS; i++) { - mItems[i] = NO_ITEM; - mItemSlots[i] = NO_ITEM; + mItems[i] = fpcNm_ITEM_NONE; + mItemSlots[i] = fpcNm_ITEM_NONE; } } @@ -284,59 +284,59 @@ u8 dSv_player_item_c::getItem(int i_slotNo, bool i_checkCombo) const { for (int i = 0; i < SELECT_ITEM_NUM; i++) { if ((i_slotNo == dComIfGs_getSelectItemIndex(i) || i_slotNo == dComIfGs_getMixItemIndex(i)) && - dComIfGs_getMixItemIndex(i) != NO_ITEM) { + dComIfGs_getMixItemIndex(i) != fpcNm_ITEM_NONE) { u8 select_item = mItems[dComIfGs_getSelectItemIndex(i)]; u8 mix_item = mItems[dComIfGs_getMixItemIndex(i)]; // Get Bomb arrow check: Bow + Normal Bombs - if ((select_item == BOW && mix_item == NORMAL_BOMB) || - (mix_item == BOW && select_item == NORMAL_BOMB)) { - return BOMB_ARROW; + if ((select_item == fpcNm_ITEM_BOW && mix_item == fpcNm_ITEM_NORMAL_BOMB) || + (mix_item == fpcNm_ITEM_BOW && select_item == fpcNm_ITEM_NORMAL_BOMB)) { + return fpcNm_ITEM_BOMB_ARROW; } // Get Bomb arrow check: Bow + Water Bombs - if ((select_item == BOW && mix_item == WATER_BOMB) || - (mix_item == BOW && select_item == WATER_BOMB)) { - return BOMB_ARROW; + if ((select_item == fpcNm_ITEM_BOW && mix_item == fpcNm_ITEM_WATER_BOMB) || + (mix_item == fpcNm_ITEM_BOW && select_item == fpcNm_ITEM_WATER_BOMB)) { + return fpcNm_ITEM_BOMB_ARROW; } // Get Bomb arrow check: Bow + Bomblings - if ((select_item == BOW && mix_item == POKE_BOMB) || - (mix_item == BOW && select_item == POKE_BOMB)) { - return BOMB_ARROW; + if ((select_item == fpcNm_ITEM_BOW && mix_item == fpcNm_ITEM_POKE_BOMB) || + (mix_item == fpcNm_ITEM_BOW && select_item == fpcNm_ITEM_POKE_BOMB)) { + return fpcNm_ITEM_BOMB_ARROW; } // Get Hawkeye check - if ((select_item == BOW && mix_item == HAWK_EYE) || - (mix_item == BOW && select_item == HAWK_EYE)) { - return HAWK_ARROW; + if ((select_item == fpcNm_ITEM_BOW && mix_item == fpcNm_ITEM_HAWK_EYE) || + (mix_item == fpcNm_ITEM_BOW && select_item == fpcNm_ITEM_HAWK_EYE)) { + return fpcNm_ITEM_HAWK_ARROW; } // Get Rod w/ bee larva - if ((select_item == FISHING_ROD_1 && mix_item == BEE_CHILD) || - (mix_item == FISHING_ROD_1 && select_item == BEE_CHILD)) { - return BEE_ROD; + if ((select_item == fpcNm_ITEM_FISHING_ROD_1 && mix_item == fpcNm_ITEM_BEE_CHILD) || + (mix_item == fpcNm_ITEM_FISHING_ROD_1 && select_item == fpcNm_ITEM_BEE_CHILD)) { + return fpcNm_ITEM_BEE_ROD; } // Get Rod w/ coral earring - if ((select_item == FISHING_ROD_1 && mix_item == ZORAS_JEWEL) || - (mix_item == FISHING_ROD_1 && select_item == ZORAS_JEWEL)) { - return JEWEL_ROD; + if ((select_item == fpcNm_ITEM_FISHING_ROD_1 && mix_item == fpcNm_ITEM_ZORAS_JEWEL) || + (mix_item == fpcNm_ITEM_FISHING_ROD_1 && select_item == fpcNm_ITEM_ZORAS_JEWEL)) { + return fpcNm_ITEM_JEWEL_ROD; } // Get Rod w/ worm - if ((select_item == FISHING_ROD_1 && mix_item == WORM) || - (mix_item == FISHING_ROD_1 && select_item == WORM)) { - return WORM_ROD; + if ((select_item == fpcNm_ITEM_FISHING_ROD_1 && mix_item == fpcNm_ITEM_WORM) || + (mix_item == fpcNm_ITEM_FISHING_ROD_1 && select_item == fpcNm_ITEM_WORM)) { + return fpcNm_ITEM_WORM_ROD; } // This block will only run on the Wii version if (i == SELECT_ITEM_B) { if (dComIfGs_getSelectItemIndex(i) == 0 && dComIfGs_getMixItemIndex(i) == 0) { - dComIfGs_setSelectItemIndex(i, NO_ITEM); - dComIfGs_setMixItemIndex(i, NO_ITEM); - return NO_ITEM; + dComIfGs_setSelectItemIndex(i, fpcNm_ITEM_NONE); + dComIfGs_setMixItemIndex(i, fpcNm_ITEM_NONE); + return fpcNm_ITEM_NONE; } } // Uncertain combination item＝＝＝＞%d, %d\n @@ -347,7 +347,7 @@ u8 dSv_player_item_c::getItem(int i_slotNo, bool i_checkCombo) const { return mItems[i_slotNo]; } - return NO_ITEM; + return fpcNm_ITEM_NONE; } /* 800332F8-80033354 02DC38 005C+00 2/2 0/0 0/0 .text setLineUpItem__17dSv_player_item_cFv */ @@ -360,12 +360,12 @@ void dSv_player_item_c::setLineUpItem() { int slot_idx = 0; for (int i = 0; i < 24; i++) { - mItemSlots[i] = NO_ITEM; + mItemSlots[i] = fpcNm_ITEM_NONE; } for (int i = 0; i < 23; i++) { u32 current = i_item_lst[i]; - if (mItems[current] != NO_ITEM) { + if (mItems[current] != fpcNm_ITEM_NONE) { mItemSlots[slot_idx] = current; slot_idx++; } @@ -378,7 +378,7 @@ u8 dSv_player_item_c::getLineUpItem(int i_slotNo) const { return mItemSlots[i_slotNo]; } - return NO_ITEM; + return fpcNm_ITEM_NONE; } /* 80033370-80033450 02DCB0 00E0+00 1/1 2/2 0/0 .text setBottleItemIn__17dSv_player_item_cFUcUc */ @@ -389,7 +389,7 @@ void dSv_player_item_c::setBottleItemIn(u8 curItemIn, u8 newItemIn) { for (int i = 0; i < 4; i++) { if (curItemIn == mItems[i + SLOT_11]) { setItem(i + SLOT_11, newItemIn); - if (newItemIn == HOT_SPRING) { + if (newItemIn == fpcNm_ITEM_HOT_SPRING) { dMeter2Info_setHotSpringTimer(i + SLOT_11); } @@ -407,14 +407,14 @@ void dSv_player_item_c::setBottleItemIn(u8 curItemIn, u8 newItemIn) { * setEmptyBottleItemIn__17dSv_player_item_cFUc */ void dSv_player_item_c::setEmptyBottleItemIn(u8 i_itemNo) { i_itemNo = dSv_item_rename(i_itemNo); - setBottleItemIn(EMPTY_BOTTLE, i_itemNo); + setBottleItemIn(fpcNm_ITEM_EMPTY_BOTTLE, i_itemNo); } /* 80033494-80033514 02DDD4 0080+00 0/0 1/1 1/1 .text setEmptyBottle__17dSv_player_item_cFv */ void dSv_player_item_c::setEmptyBottle() { for (int i = 0; i < 4; i++) { - if (dComIfGs_getItem((u8)(i + SLOT_11), true) == NO_ITEM) { - dComIfGs_setItem((u8)(i + SLOT_11), EMPTY_BOTTLE); + if (dComIfGs_getItem((u8)(i + SLOT_11), true) == fpcNm_ITEM_NONE) { + dComIfGs_setItem((u8)(i + SLOT_11), fpcNm_ITEM_EMPTY_BOTTLE); return; } } @@ -423,7 +423,7 @@ void dSv_player_item_c::setEmptyBottle() { /* 80033514-80033598 02DE54 0084+00 0/0 3/3 0/0 .text setEmptyBottle__17dSv_player_item_cFUc */ void dSv_player_item_c::setEmptyBottle(u8 i_itemNo) { for (int i = 0; i < 4; i++) { - if (dComIfGs_getItem((u8)(i + SLOT_11), true) == NO_ITEM) { + if (dComIfGs_getItem((u8)(i + SLOT_11), true) == fpcNm_ITEM_NONE) { dComIfGs_setItem((u8)(i + SLOT_11), i_itemNo); return; } @@ -437,7 +437,7 @@ void dSv_player_item_c::setEquipBottleItemIn(u8 curItemIn, u8 newItemIn) { if (dComIfGs_getSelectItemIndex(curItemIn) >= SLOT_11 && dComIfGs_getSelectItemIndex(curItemIn) <= SLOT_14) { - if (newItemIn == HOT_SPRING) { + if (newItemIn == fpcNm_ITEM_HOT_SPRING) { dMeter2Info_setHotSpringTimer(dComIfGs_getSelectItemIndex(curItemIn)); } @@ -451,7 +451,7 @@ void dSv_player_item_c::setEquipBottleItemIn(u8 curItemIn, u8 newItemIn) { /* 800336BC-800336E0 02DFFC 0024+00 0/0 4/4 0/0 .text * setEquipBottleItemEmpty__17dSv_player_item_cFUc */ void dSv_player_item_c::setEquipBottleItemEmpty(u8 curItemIn) { - setEquipBottleItemIn(curItemIn, EMPTY_BOTTLE); + setEquipBottleItemIn(curItemIn, fpcNm_ITEM_EMPTY_BOTTLE); } /* 800336E0-80033754 02E020 0074+00 0/0 30/30 0/0 .text checkBottle__17dSv_player_item_cFUc */ @@ -547,7 +547,7 @@ u16 dSv_event_flag_c::saveBitLabels[822] = { /* 80033754-800337EC 02E094 0098+00 0/0 1/1 0/0 .text checkInsectBottle__17dSv_player_item_cFv */ BOOL dSv_player_item_c::checkInsectBottle() { for (int i = 0; i < 24; i++) { - if (dComIfGs_isItemFirstBit(M_BEETLE + i) && + if (dComIfGs_isItemFirstBit(fpcNm_ITEM_M_BEETLE + i) && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x191 + i])) { return TRUE; } @@ -560,7 +560,7 @@ u8 dSv_player_item_c::checkEmptyBottle() { u8 bottleNum = 0; for (int i = 0; i < BOTTLE_MAX; i++) { - if (mItems[i + SLOT_11] == EMPTY_BOTTLE) { + if (mItems[i + SLOT_11] == fpcNm_ITEM_EMPTY_BOTTLE) { bottleNum++; } } @@ -574,7 +574,7 @@ void dSv_player_item_c::setBombBagItemIn(u8 i_curBomb, u8 i_newBomb, bool i_setN if (i_curBomb == mItems[i + SLOT_15]) { setItem(i + SLOT_15, i_newBomb); - if (i_setNum == true && i_newBomb != BOMB_BAG_LV1) { + if (i_setNum == true && i_newBomb != fpcNm_ITEM_BOMB_BAG_LV1) { dComIfGs_setBombNum(i, dComIfGs_getBombMax(i_newBomb)); } @@ -595,7 +595,7 @@ void dSv_player_item_c::setBombBagItemIn(u8 i_curBomb, u8 i_newBomb, u8 i_bombNu if (i_curBomb == mItems[i + SLOT_15]) { setItem(i + SLOT_15, i_newBomb); - if (i_setNum == 1 && i_newBomb != BOMB_BAG_LV1) { + if (i_setNum == 1 && i_newBomb != fpcNm_ITEM_BOMB_BAG_LV1) { if (i_bombNum > dComIfGs_getBombMax(i_newBomb)) { i_bombNum = dComIfGs_getBombMax(i_newBomb); } @@ -615,20 +615,20 @@ void dSv_player_item_c::setBombBagItemIn(u8 i_curBomb, u8 i_newBomb, u8 i_bombNu /* 80033A20-80033A50 02E360 0030+00 0/0 2/2 0/0 .text * setEmptyBombBagItemIn__17dSv_player_item_cFUcb */ void dSv_player_item_c::setEmptyBombBagItemIn(u8 i_newBomb, bool i_setNum) { - setBombBagItemIn(BOMB_BAG_LV1, i_newBomb, i_setNum); + setBombBagItemIn(fpcNm_ITEM_BOMB_BAG_LV1, i_newBomb, i_setNum); } /* 80033A50-80033A88 02E390 0038+00 0/0 1/1 1/1 .text * setEmptyBombBagItemIn__17dSv_player_item_cFUcUcb */ void dSv_player_item_c::setEmptyBombBagItemIn(u8 i_newBomb, u8 i_bombNum, bool i_setNum) { - setBombBagItemIn(BOMB_BAG_LV1, i_newBomb, i_bombNum, i_setNum); + setBombBagItemIn(fpcNm_ITEM_BOMB_BAG_LV1, i_newBomb, i_bombNum, i_setNum); } /* 80033A88-80033B08 02E3C8 0080+00 0/0 2/2 0/0 .text setEmptyBombBag__17dSv_player_item_cFv */ void dSv_player_item_c::setEmptyBombBag() { for (int i = 0; i < 3; i++) { - if (dComIfGs_getItem((u8)(i + SLOT_15), true) == NO_ITEM) { - dComIfGs_setItem((u8)(i + SLOT_15), BOMB_BAG_LV1); + if (dComIfGs_getItem((u8)(i + SLOT_15), true) == fpcNm_ITEM_NONE) { + dComIfGs_setItem((u8)(i + SLOT_15), fpcNm_ITEM_BOMB_BAG_LV1); return; } } @@ -637,10 +637,10 @@ void dSv_player_item_c::setEmptyBombBag() { /* 80033B08-80033BEC 02E448 00E4+00 0/0 3/3 0/0 .text setEmptyBombBag__17dSv_player_item_cFUcUc */ void dSv_player_item_c::setEmptyBombBag(u8 i_newBomb, u8 i_bombNum) { for (int i = 0; i < 3; i++) { - if (dComIfGs_getItem((u8)(i + SLOT_15), true) == NO_ITEM) { + if (dComIfGs_getItem((u8)(i + SLOT_15), true) == fpcNm_ITEM_NONE) { dComIfGs_setItem((u8)(i + SLOT_15), i_newBomb); - if (i_newBomb == BOMB_BAG_LV1) { + if (i_newBomb == fpcNm_ITEM_BOMB_BAG_LV1) { return; } @@ -681,16 +681,16 @@ void dSv_player_item_c::setWarashibeItem(u8 i_itemNo) { /* 80033CBC-80033D40 02E5FC 0084+00 0/0 1/1 0/0 .text setRodTypeLevelUp__17dSv_player_item_cFv */ void dSv_player_item_c::setRodTypeLevelUp() { switch (mItems[SLOT_20]) { - case BEE_ROD: { - mItems[SLOT_20] = JEWEL_BEE_ROD; + case fpcNm_ITEM_BEE_ROD: { + mItems[SLOT_20] = fpcNm_ITEM_JEWEL_BEE_ROD; break; } - case WORM_ROD: { - mItems[SLOT_20] = JEWEL_WORM_ROD; + case fpcNm_ITEM_WORM_ROD: { + mItems[SLOT_20] = fpcNm_ITEM_JEWEL_WORM_ROD; break; } - case FISHING_ROD_1: { - mItems[SLOT_20] = JEWEL_ROD; + case fpcNm_ITEM_FISHING_ROD_1: { + mItems[SLOT_20] = fpcNm_ITEM_JEWEL_ROD; break; } } @@ -704,19 +704,19 @@ void dSv_player_item_c::setRodTypeLevelUp() { */ void dSv_player_item_c::setBaitItem(u8 i_itemNo) { switch (i_itemNo) { - case BEE_CHILD: { - dComIfGs_isItemFirstBit(ZORAS_JEWEL) ? mItems[SLOT_20] = JEWEL_BEE_ROD : - mItems[SLOT_20] = BEE_ROD; + case fpcNm_ITEM_BEE_CHILD: { + dComIfGs_isItemFirstBit(fpcNm_ITEM_ZORAS_JEWEL) ? mItems[SLOT_20] = fpcNm_ITEM_JEWEL_BEE_ROD : + mItems[SLOT_20] = fpcNm_ITEM_BEE_ROD; break; } - case WORM: { - dComIfGs_isItemFirstBit(ZORAS_JEWEL) ? mItems[SLOT_20] = JEWEL_WORM_ROD : - mItems[SLOT_20] = WORM_ROD; + case fpcNm_ITEM_WORM: { + dComIfGs_isItemFirstBit(fpcNm_ITEM_ZORAS_JEWEL) ? mItems[SLOT_20] = fpcNm_ITEM_JEWEL_WORM_ROD : + mItems[SLOT_20] = fpcNm_ITEM_WORM_ROD; break; } - case NO_ITEM: { - dComIfGs_isItemFirstBit(ZORAS_JEWEL) ? mItems[SLOT_20] = JEWEL_ROD : - mItems[SLOT_20] = FISHING_ROD_1; + case fpcNm_ITEM_NONE: { + dComIfGs_isItemFirstBit(fpcNm_ITEM_ZORAS_JEWEL) ? mItems[SLOT_20] = fpcNm_ITEM_JEWEL_ROD : + mItems[SLOT_20] = fpcNm_ITEM_FISHING_ROD_1; break; } } @@ -815,22 +815,22 @@ void dSv_player_item_max_c::init() { for (int i = 0; i < 7; i++) { mItemMax[i] = 30; } - setBombNum(NORMAL_BOMB, 30); - setBombNum(WATER_BOMB, 15); - setBombNum(POKE_BOMB, 10); + setBombNum(fpcNm_ITEM_NORMAL_BOMB, 30); + setBombNum(fpcNm_ITEM_WATER_BOMB, 15); + setBombNum(fpcNm_ITEM_POKE_BOMB, 10); mItemMax[7] = 0; } /* 800340B8-800340F8 02E9F8 0040+00 1/1 0/0 0/0 .text setBombNum__21dSv_player_item_max_cFUcUc */ void dSv_player_item_max_c::setBombNum(u8 i_bombType, u8 i_maxNum) { switch (i_bombType) { - case NORMAL_BOMB: + case fpcNm_ITEM_NORMAL_BOMB: mItemMax[NORMAL_BOMB_MAX] = i_maxNum; return; - case WATER_BOMB: + case fpcNm_ITEM_WATER_BOMB: mItemMax[WATER_BOMB_MAX] = i_maxNum; return; - case POKE_BOMB: + case fpcNm_ITEM_POKE_BOMB: mItemMax[POKE_BOMB_MAX] = i_maxNum; return; } @@ -839,16 +839,16 @@ void dSv_player_item_max_c::setBombNum(u8 i_bombType, u8 i_maxNum) { /* 800340F8-800341AC 02EA38 00B4+00 3/3 14/14 2/2 .text getBombNum__21dSv_player_item_max_cCFUc */ u8 dSv_player_item_max_c::getBombNum(u8 i_bombType) const { u8 lv_multiplier = 1; - if (dComIfGs_isItemFirstBit(BOMB_BAG_LV2)) { + if (dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_BAG_LV2)) { lv_multiplier = 2; } switch (i_bombType) { - case NORMAL_BOMB: + case fpcNm_ITEM_NORMAL_BOMB: return (u8)(mItemMax[NORMAL_BOMB_MAX] * lv_multiplier); - case WATER_BOMB: + case fpcNm_ITEM_WATER_BOMB: return (u8)(mItemMax[WATER_BOMB_MAX] * lv_multiplier); - case POKE_BOMB: + case fpcNm_ITEM_POKE_BOMB: return (u8)(mItemMax[POKE_BOMB_MAX] * lv_multiplier); default: return 0; @@ -1677,9 +1677,9 @@ int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) { } // If have the lantern and Slot 1 in the item wheel is blank - if (dComIfGs_isItemFirstBit(KANTERA) && dComIfGs_getItem(SLOT_1, 1) == NO_ITEM) { + if (dComIfGs_isItemFirstBit(fpcNm_ITEM_KANTERA) && dComIfGs_getItem(SLOT_1, 1) == fpcNm_ITEM_NONE) { // Set Slot 1 to Lantern and fetch current oil - dComIfGs_setItem(SLOT_1, KANTERA); + dComIfGs_setItem(SLOT_1, fpcNm_ITEM_KANTERA); current_lantern_oil = dComIfGs_getOil(); // Set oil to oil gauge backup @@ -1719,7 +1719,7 @@ int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) { // Now that we've saved, reset slot if needed if (tmp_lantern_check == true) { - dComIfGs_setItem(SLOT_1, NO_ITEM); + dComIfGs_setItem(SLOT_1, fpcNm_ITEM_NONE); dComIfGs_setOil(current_lantern_oil); } @@ -1749,13 +1749,13 @@ int dSv_info_c::card_to_memory(char* i_cardPtr, int i_dataNum) { dComIfGs_setKeyNum(6, 0); - if (dComIfGs_getItem(SLOT_9, true) == W_HOOKSHOT) { - dComIfGs_setItem(SLOT_10, W_HOOKSHOT); - dComIfGs_setItem(SLOT_9, NO_ITEM); + if (dComIfGs_getItem(SLOT_9, true) == fpcNm_ITEM_W_HOOKSHOT) { + dComIfGs_setItem(SLOT_10, fpcNm_ITEM_W_HOOKSHOT); + dComIfGs_setItem(SLOT_9, fpcNm_ITEM_NONE); } - if (dComIfGs_getItem(SLOT_9, true) == HOOKSHOT && dComIfGs_getItem(SLOT_10, true) == W_HOOKSHOT) { - dComIfGs_setItem(SLOT_9, NO_ITEM); + if (dComIfGs_getItem(SLOT_9, true) == fpcNm_ITEM_HOOKSHOT && dComIfGs_getItem(SLOT_10, true) == fpcNm_ITEM_W_HOOKSHOT) { + dComIfGs_setItem(SLOT_9, fpcNm_ITEM_NONE); } dComIfGs_setLineUpItem(); diff --git a/src/d/d_shop_system.cpp b/src/d/d_shop_system.cpp index 7705988734..41f358f75b 100644 --- a/src/d/d_shop_system.cpp +++ b/src/d/d_shop_system.cpp @@ -28,7 +28,7 @@ static daTag_ShopItem_c* dShopSystem_itemActor[7] = { /* 804506E8-804506F0 000168 0007+01 7/7 0/0 0/0 .sdata dShopSystem_itemNo */ static u8 dShopSystem_itemNo[7] = { - NO_ITEM, NO_ITEM, NO_ITEM, NO_ITEM, NO_ITEM, NO_ITEM, NO_ITEM, + fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, }; /* 80451058-8045105C 000558 0004+00 9/9 0/0 0/0 .sbss None */ @@ -62,7 +62,7 @@ static int dShopSystem_searchItemActor(void* i_actor, void* param_1) { if ((sw == 0xFF || !dComIfGs_isSaveSwitch(sw)) && (sw2 == 0xFF || dComIfGs_isSaveSwitch(sw2))) { - if (sw != 0xFF && item_no == HYLIA_SHIELD && checkItemGet(item_no, true)) { + if (sw != 0xFF && item_no == fpcNm_ITEM_HYLIA_SHIELD && checkItemGet(item_no, true)) { dComIfGs_onSaveSwitch(sw); } else { if (i_posID == 0) { @@ -126,7 +126,7 @@ void dShopSystem_c::initShopSystem() { for (int i = 0; i < 7; i++) { dShopSystem_itemActor[i] = NULL; - dShopSystem_itemNo[i] = NO_ITEM; + dShopSystem_itemNo[i] = fpcNm_ITEM_NONE; } dShopSystem_item_count = 0; @@ -196,7 +196,7 @@ dShopSystem_c::~dShopSystem_c() { for (int i = 0; i < 7; i++) { dShopSystem_itemActor[i] = NULL; - dShopSystem_itemNo[i] = NO_ITEM; + dShopSystem_itemNo[i] = fpcNm_ITEM_NONE; } dShopSystem_item_count = 0; @@ -721,7 +721,7 @@ int dShopSystem_c::itemRotate() { u8 cursor_pos = mCursorPos; if (cursor_pos != 0 && mSeq != SEQ_WAIT) { - if (dShopSystem_itemNo[cursor_pos - 1] == ARMOR) { + if (dShopSystem_itemNo[cursor_pos - 1] == fpcNm_ITEM_ARMOR) { int tmp_index; if (isFlag(8) == false) { tmp_index = 0; @@ -756,7 +756,7 @@ int dShopSystem_c::itemZoom(cXyz* param_0) { if (field_0xf60 >= 0) { local_1c.set(*param_0); - if (dShopSystem_itemNo[mCursorPos - 1] == OIL_BOTTLE) { + if (dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_OIL_BOTTLE) { mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mSeraShopObjZoomAngleX + -5000, isFlag(8) ? true : false); @@ -807,9 +807,9 @@ int dShopSystem_c::itemZoom(cXyz* param_0) { g_cursorHIO.mObjZoom.z + 150.0f); } else { if (field_0xf77 == 5) { - if (dShopSystem_itemNo[mCursorPos - 1] == ARROW_10 || - dShopSystem_itemNo[mCursorPos - 1] == ARROW_20 || - dShopSystem_itemNo[mCursorPos - 1] == ARROW_30) + if (dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_ARROW_10 || + dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_ARROW_20 || + dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_ARROW_30) { local_34.set(g_cursorHIO.mObjZoom.x, -50.0f + g_cursorHIO.mObjZoom.y + 5.0f, (g_cursorHIO.mObjZoom.z + 250.0f) - 60.0f); @@ -840,7 +840,7 @@ int dShopSystem_c::itemZoom(cXyz* param_0) { u8 dvar1 = field_0xf77; if (dvar1 == 1) { - if (dShopSystem_itemNo[mCursorPos - 1] == OIL_BOTTLE) { + if (dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_OIL_BOTTLE) { mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX + -7000, isFlag(8) ? true : false); @@ -849,7 +849,7 @@ int dShopSystem_c::itemZoom(cXyz* param_0) { isFlag(8) ? true : false); } } else if (dvar1 == 2) { - if (dShopSystem_itemNo[mCursorPos - 1] == RED_BOTTLE) { + if (dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_RED_BOTTLE) { mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX - 3000, isFlag(8) ? true : false); } else { @@ -857,9 +857,9 @@ int dShopSystem_c::itemZoom(cXyz* param_0) { isFlag(8) ? true : false); } } else if (dvar1 == 5) { - if (dShopSystem_itemNo[mCursorPos - 1] == ARROW_10 || - dShopSystem_itemNo[mCursorPos - 1] == ARROW_20 || - dShopSystem_itemNo[mCursorPos - 1] == ARROW_30) + if (dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_ARROW_10 || + dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_ARROW_20 || + dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_ARROW_30) { mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX - 4000, isFlag(8) ? true : false); @@ -1359,7 +1359,7 @@ static shop_item_data* shop_item_pos_data_tbl = &item_seira_shop; */ void dShopSystem_c::createShopItem(int itemType) { static const u8 item_no[6] = { - MILK_BOTTLE, BEE_CHILD, PACHINKO, MILK_BOTTLE, BEE_CHILD, NO_ITEM, + fpcNm_ITEM_MILK_BOTTLE, fpcNm_ITEM_BEE_CHILD, fpcNm_ITEM_PACHINKO, fpcNm_ITEM_MILK_BOTTLE, fpcNm_ITEM_BEE_CHILD, fpcNm_ITEM_NONE, }; if (itemType != -1) { @@ -1374,7 +1374,7 @@ void dShopSystem_c::createShopItem(int itemType) { pos.y = shop_item_pos_data_tbl->mItemPos[i].y + current.pos.y; pos.z = shop_item_pos_data_tbl->mItemPos[i].z + current.pos.z; - if (itemTbl[i] != NO_ITEM) { + if (itemTbl[i] != fpcNm_ITEM_NONE) { u32 index = fopAcM_create(PROC_ShopItem, itemTbl[i], &pos, fopAcM_GetRoomNo(this), ¤t.angle, NULL, -1); mItemCtrl.setItemIndex(i, index); @@ -1418,19 +1418,19 @@ void dShopSystem_c::setSoldOut() { return; } else if (index == 0) { dShopSystem_itemActor[0] = NULL; - dShopSystem_itemNo[0] = NO_ITEM; + dShopSystem_itemNo[0] = fpcNm_ITEM_NONE; dShopSystem_item_count = 2; } else if (index == 1) { dShopSystem_itemActor[1] = NULL; - dShopSystem_itemNo[1] = NO_ITEM; + dShopSystem_itemNo[1] = fpcNm_ITEM_NONE; dShopSystem_item_count = 2; } else if (index == 2) { dShopSystem_itemActor[2] = NULL; - dShopSystem_itemNo[2] = NO_ITEM; + dShopSystem_itemNo[2] = fpcNm_ITEM_NONE; dShopSystem_item_count = 2; } else if (index == 6) { dShopSystem_itemActor[6] = NULL; - dShopSystem_itemNo[6] = NO_ITEM; + dShopSystem_itemNo[6] = fpcNm_ITEM_NONE; dShopSystem_item_count = 6; } @@ -1660,4 +1660,4 @@ bool dShopSystem_c::dpdMove() { return false; } -#pragma nosyminline on \ No newline at end of file +#pragma nosyminline on diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index d363aec839..4fca4f0cbc 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -1135,7 +1135,7 @@ fpc_ProcID fopAcM_createItemForPresentDemo(cXyz const* i_pos, int i_itemNo, u8 p cXyz const* i_scale) { dComIfGp_event_setGtItm(i_itemNo); - if (i_itemNo == NO_ITEM) { + if (i_itemNo == fpcNm_ITEM_NONE) { return fpcM_ERROR_PROCESS_ID_e; } @@ -1148,7 +1148,7 @@ fpc_ProcID fopAcM_createItemForTrBoxDemo(cXyz const* i_pos, int i_itemNo, int i_ int i_roomNo, csXyz const* i_angle, cXyz const* i_scale) { dComIfGp_event_setGtItm(i_itemNo); - if (i_itemNo == NO_ITEM) { + if (i_itemNo == fpcNm_ITEM_NONE) { return fpcM_ERROR_PROCESS_ID_e; } @@ -1276,7 +1276,7 @@ fpc_ProcID fopAcM_createItemFromTable(cXyz const* i_pos, int i_tableNo, int i_it #endif int itemNo = fopAcM_getItemNoFromTableNo(i_tableNo); - if (itemNo == NO_ITEM) { + if (itemNo == fpcNm_ITEM_NONE) { return fpcM_ERROR_PROCESS_ID_e; } @@ -1304,7 +1304,7 @@ fpc_ProcID fopAcM_createDemoItem(const cXyz* i_pos, int i_itemNo, int i_itemBitN JUT_ASSERT(0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255); // clang-format on - if (i_itemNo == NO_ITEM) { + if (i_itemNo == fpcNm_ITEM_NONE) { return fpcM_ERROR_PROCESS_ID_e; } @@ -1364,7 +1364,7 @@ fpc_ProcID fopAcM_createItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, i JUT_ASSERT(0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255); // clang-format on - if (i_itemNo == NO_ITEM) { + if (i_itemNo == fpcNm_ITEM_NONE) { return fpcM_ERROR_PROCESS_ID_e; } @@ -1380,29 +1380,29 @@ fpc_ProcID fopAcM_createItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, i u32 params = MAKE_ITEM_PARAMS(item_no, i_itemBitNo, 0xFF, param_7); switch (i_itemNo) { - case RECOVERY_FAILY: + case fpcNm_ITEM_RECOVERY_FAILY: return fopAcM_create(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1); #ifdef DEBUG - case SMALL_KEY: + case fpcNm_ITEM_SMALL_KEY: // "Small Key: Can't support map display, so program generation is prohibited!\n" OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); JUT_ASSERT(0); break; - case KANTERA: + case fpcNm_ITEM_KANTERA: // "Lantern: Program generation is prohibited!\n" OS_REPORT_ERROR("カンテラ：プログラム生成禁止！\n"); JUT_ASSERT(0); break; - case LIGHT_DROP: + case fpcNm_ITEM_LIGHT_DROP: // "Light Drop: Program generation is prohibited!\n" OS_REPORT_ERROR("光の雫：プログラム生成禁止！\n"); JUT_ASSERT(0); break; #endif - case KAKERA_HEART: - case UTAWA_HEART: + case fpcNm_ITEM_KAKERA_HEART: + case fpcNm_ITEM_UTAWA_HEART: return fopAcM_create(PROC_Obj_LifeContainer, params, i_pos, i_roomNo, i_angle, i_scale, -1); - case TRIPLE_HEART: + case fpcNm_ITEM_TRIPLE_HEART: for (int i = 0; i < 2; i++) { fopAcM_create(PROC_ITEM, params, i_pos, i_roomNo, &item_angle, i_scale, -1); item_angle.y = cM_rndFX(0x7FFF); @@ -1422,7 +1422,7 @@ fopAc_ac_c* fopAcM_fastCreateItem2(const cXyz* i_pos, int i_itemNo, int i_itemBi csXyz item_angle(csXyz::Zero); - if (i_itemNo == NO_ITEM) { + if (i_itemNo == fpcNm_ITEM_NONE) { return NULL; } @@ -1437,31 +1437,31 @@ fopAc_ac_c* fopAcM_fastCreateItem2(const cXyz* i_pos, int i_itemNo, int i_itemBi u32 params = MAKE_ITEM_PARAMS(item_no, i_itemBitNo, 0xFF, param_5); switch (i_itemNo) { - case RECOVERY_FAILY: + case fpcNm_ITEM_RECOVERY_FAILY: return fopAcM_fastCreate(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); #ifdef DEBUG - case SMALL_KEY: + case fpcNm_ITEM_SMALL_KEY: // "Small Key: Can't support map display, so program generation is prohibited!\n" OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); JUT_ASSERT(0); break; - case KANTERA: + case fpcNm_ITEM_KANTERA: // "Lantern: Program generation is prohibited!\n" OS_REPORT_ERROR("カンテラ：プログラム生成禁止！\n"); JUT_ASSERT(0); break; - case LIGHT_DROP: + case fpcNm_ITEM_LIGHT_DROP: // "Light Drop: Program generation is prohibited!\n" OS_REPORT_ERROR("光の雫：プログラム生成禁止！\n"); JUT_ASSERT(0); break; #endif - case KAKERA_HEART: - case UTAWA_HEART: + case fpcNm_ITEM_KAKERA_HEART: + case fpcNm_ITEM_UTAWA_HEART: return fopAcM_fastCreate(PROC_Obj_LifeContainer, params, i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); - case TRIPLE_HEART: + case fpcNm_ITEM_TRIPLE_HEART: for (int i = 0; i < 2; i++) { fopAcM_fastCreate(PROC_ITEM, params, i_pos, i_roomNo, &item_angle, i_scale, -1, NULL, NULL); @@ -1482,7 +1482,7 @@ fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, JUT_ASSERT(0 <= i_itemNo && i_itemNo < 256); csXyz angle; - if (i_itemNo == NO_ITEM) { + if (i_itemNo == fpcNm_ITEM_NONE) { return NULL; } @@ -1497,31 +1497,31 @@ fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, } switch (i_itemNo) { - case RECOVERY_FAILY: + case fpcNm_ITEM_RECOVERY_FAILY: return fopAcM_fastCreate(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); #ifdef DEBUG - case SMALL_KEY: + case fpcNm_ITEM_SMALL_KEY: // "Small Key: Can't support map display, so program generation is prohibited!\n" OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); JUT_ASSERT(0); break; - case KANTERA: + case fpcNm_ITEM_KANTERA: // "Lantern: Program generation is prohibited!\n" OS_REPORT_ERROR("カンテラ：プログラム生成禁止！\n"); JUT_ASSERT(0); break; - case LIGHT_DROP: + case fpcNm_ITEM_LIGHT_DROP: // "Light Drop: Program generation is prohibited!\n" OS_REPORT_ERROR("光の雫：プログラム生成禁止！\n"); JUT_ASSERT(0); break; #endif - case KAKERA_HEART: - case UTAWA_HEART: + case fpcNm_ITEM_KAKERA_HEART: + case fpcNm_ITEM_UTAWA_HEART: return fopAcM_fastCreate(PROC_Obj_LifeContainer, params, i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); - case TRIPLE_HEART: + case fpcNm_ITEM_TRIPLE_HEART: for (i = 0; i < 2; i++) { if (i_angle != NULL) { angle = *i_angle;