mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-01 17:29:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add Link's proc enum

Browse Source
This commit is contained in:
LagoLunatic
2023-10-23 19:38:33 -04:00
parent 2ac03c0187
commit 05e335b7b6
2 changed files with 466 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_player_link.h
+225 -5
View File
@@ -967,7 +967,227 @@ enum LKANM_RES_FILE_ID { // IDs and indexes are synced
class daPy_lk_c : public daPy_py_c {
public:
enum daPy_PROC {};
enum daPy_PROC {
PROC_SCOPE_e = 0x00,
PROC_SUBJECTIVITY_e = 0x01,
PROC_CALL_e = 0x02,
PROC_CONTROLL_WAIT_e = 0x03,
PROC_WAIT_e = 0x04,
PROC_FREE_WAIT_e = 0x05,
PROC_MOVE_e = 0x06,
PROC_ATN_MOVE_e = 0x07,
PROC_ATN_ACTOR_WAIT_e = 0x08,
PROC_ATN_ACTOR_MOVE_e = 0x09,
PROC_SIDE_STEP_e = 0x0A,
PROC_SIDE_STEP_LAND_e = 0x0B,
PROC_CROUCH_DEFENSE_e = 0x0C,
PROC_CROUCH_DEFENSE_SLIP_e = 0x0D,
PROC_CROUCH_e = 0x0E,
PROC_CRAWL_START_e = 0x0F,
PROC_CRAWL_MOVE_e = 0x10,
PROC_CRAWL_AUTO_MOVE_e = 0x11,
PROC_CRAWL_END_e = 0x12,
PROC_WHIDE_READY_e = 0x13,
PROC_WHIDE_WAIT_e = 0x14,
PROC_WHIDE_MOVE_e = 0x15,
PROC_WHIDE_PEEP_e = 0x16,
PROC_WAIT_TURN_e = 0x17,
PROC_MOVE_TURN_e = 0x18,
PROC_SLIP_e = 0x19,
PROC_SLIDE_FRONT_e = 0x1A,
PROC_SLIDE_BACK_e = 0x1B,
PROC_SLIDE_FRONT_LAND_e = 0x1C,
PROC_SLIDE_BACK_LAND_e = 0x1D,
PROC_FRONT_ROLL_e = 0x1E,
PROC_FRONT_ROLL_CRASH_e = 0x1F,
PROC_NOCK_BACK_END_e = 0x20,
PROC_SIDE_ROLL_e = 0x21,
PROC_BACK_JUMP_e = 0x22,
PROC_BACK_JUMP_LAND_e = 0x23,
PROC_AUTO_JUMP_e = 0x24,
PROC_LAND_e = 0x25,
PROC_LAND_DAMAGE_e = 0x26,
PROC_FALL_e = 0x27,
PROC_SLOW_FALL_e = 0x28,
PROC_SMALL_JUMP_e = 0x29,
PROC_VERTICAL_JUMP_e = 0x2A,
PROC_HANG_START_e = 0x2B,
PROC_HANG_FALL_START_e = 0x2C,
PROC_HANG_UP_e = 0x2D,
PROC_HANG_WAIT_e = 0x2E,
PROC_HANG_MOVE_e = 0x2F,
PROC_HANG_CLIMB_e = 0x30,
PROC_HANG_WALL_CATCH_e = 0x31,
PROC_PUSH_PULL_WAIT_e = 0x32,
PROC_PUSH_MOVE_e = 0x33,
PROC_PULL_MOVE_e = 0x34,
PROC_SWIM_UP_e = 0x35,
PROC_SWIM_WAIT_e = 0x36,
PROC_SWIM_MOVE_e = 0x37,
PROC_LADDER_UP_START_e = 0x38,
PROC_LADDER_UP_END_e = 0x39,
PROC_LADDER_DOWN_START_e = 0x3A,
PROC_LADDER_DOWN_END_e = 0x3B,
PROC_LADDER_MOVE_e = 0x3C,
PROC_CLIMB_UP_START_e = 0x3D,
PROC_CLIMB_DOWN_START_e = 0x3E,
PROC_CLIMB_MOVE_UP_DOWN_e = 0x3F,
PROC_CLIMB_MOVE_SIDE_e = 0x40,
PROC_CUT_A_e = 0x41,
PROC_CUT_F_e = 0x42,
PROC_CUT_R_e = 0x43,
PROC_CUT_L_e = 0x44,
PROC_CUT_EA_e = 0x45,
PROC_CUT_EB_e = 0x46,
PROC_CUT_EX_A_e = 0x47,
PROC_CUT_EX_B_e = 0x48,
PROC_CUT_EX_MJ_e = 0x49,
PROC_CUT_KESA_e = 0x4A,
PROC_WEAPON_NORMAL_SWING_e = 0x4B,
PROC_WEAPON_SIDE_SWING_e = 0x4C,
PROC_WEAPON_FRONT_SWING_READY_e = 0x4D,
PROC_WEAPON_FRONT_SWING_e = 0x4E,
PROC_WEAPON_FRONT_SWING_END_e = 0x4F,
PROC_WEAPON_THROW_e = 0x50,
PROC_HAMMER_SIDE_SWING_e = 0x51,
PROC_HAMMER_FRONT_SWING_READY_e = 0x52,
PROC_HAMMER_FRONT_SWING_e = 0x53,
PROC_HAMMER_FRONT_SWING_END_e = 0x54,
PROC_CUT_TURN_e = 0x55,
PROC_CUT_ROLL_e = 0x56,
PROC_CUT_ROLL_END_e = 0x57,
PROC_CUT_TURN_CHARGE_e = 0x58,
PROC_CUT_TURN_MOVE_e = 0x59,
PROC_CUT_REVERSE_e = 0x5A,
PROC_JUMP_CUT_e = 0x5B,
PROC_JUMP_CUT_LAND_e = 0x5C,
PROC_BT_JUMP_e = 0x5D,
PROC_BT_JUMP_CUT_e = 0x5E,
PROC_BT_SLIDE_e = 0x5F,
PROC_BT_ROLL_e = 0x60,
PROC_BT_ROLL_CUT_e = 0x61,
PROC_BT_VERTICAL_JUMP_e = 0x62,
PROC_BT_VERTICAL_JUMP_CUT_e = 0x63,
PROC_BT_VERTICAL_JUMP_LAND_e = 0x64,
PROC_GUARD_CRASH_e = 0x65,
PROC_DAMAGE_e = 0x66,
PROC_POLY_DAMAGE_e = 0x67,
PROC_LARGE_DAMAGE_e = 0x68,
PROC_LARGE_DAMAGE_UP_e = 0x69,
PROC_LARGE_DAMAGE_WALL_e = 0x6A,
PROC_LAVA_DAMAGE_e = 0x6B,
PROC_ELEC_DAMAGE_e = 0x6C,
PROC_GUARD_SLIP_e = 0x6D,
PROC_GRAB_READY_e = 0x6E,
PROC_GRAB_UP_e = 0x6F,
PROC_GRAB_MISS_e = 0x70,
PROC_GRAB_THROW_e = 0x71,
PROC_GRAB_PUT_e = 0x72,
PROC_GRAB_WAIT_e = 0x73,
PROC_GRAB_HEAVY_WAIT_e = 0x74,
PROC_GRAB_REBOUND_e = 0x75,
PROC_ROPE_SUBJECT_e = 0x76,
PROC_ROPE_READY_e = 0x77,
PROC_ROPE_SWING_e = 0x78,
PROC_ROPE_HANG_WAIT_e = 0x79,
PROC_ROPE_UP_e = 0x7A,
PROC_ROPE_DOWN_e = 0x7B,
PROC_ROPE_SWING_START_e = 0x7C,
PROC_ROPE_MOVE_e = 0x7D,
PROC_ROPE_THROW_CATCH_e = 0x7E,
PROC_ROPE_UP_HANG_e = 0x7F,
PROC_BOOMERANG_SUBJECT_e = 0x80,
PROC_BOOMERANG_MOVE_e = 0x81,
PROC_BOOMERANG_CATCH_e = 0x82,
PROC_HOOKSHOT_SUBJECT_e = 0x83,
PROC_HOOKSHOT_MOVE_e = 0x84,
PROC_HOOKSHOT_FLY_e = 0x85,
PROC_SHIP_READY_e = 0x86,
PROC_SHIP_JUMP_RIDE_e = 0x87,
PROC_SHIP_STEER_e = 0x88,
PROC_SHIP_PADDLE_e = 0x89,
PROC_SHIP_SCOPE_e = 0x8A,
PROC_SHIP_BOOMERANG_e = 0x8B,
PROC_SHIP_HOOKSHOT_e = 0x8C,
PROC_SHIP_BOW_e = 0x8D,
PROC_SHIP_CANNON_e = 0x8E,
PROC_SHIP_CRANE_e = 0x8F,
PROC_SHIP_GET_OFF_e = 0x90,
PROC_SHIP_RESTART_e = 0x91,
PROC_FAN_SWING_e = 0x92,
PROC_FAN_GLIDE_e = 0x93,
PROC_BOW_SUBJECT_e = 0x94,
PROC_BOW_MOVE_e = 0x95,
PROC_VOMIT_READY_e = 0x96,
PROC_VOMIT_WAIT_e = 0x97,
PROC_VOMIT_JUMP_e = 0x98,
PROC_VOMIT_LAND_e = 0x99,
PROC_TACT_WAIT_e = 0x9A,
PROC_TACT_PLAY_e = 0x9B,
PROC_TACT_PLAY_END_e = 0x9C,
PROC_TACT_PLAY_ORIGINAL_e = 0x9D,
PROC_ICE_SLIP_FALL_e = 0x9E,
PROC_ICE_SLIP_FALL_UP_e = 0x9F,
PROC_ICE_SLIP_ALMOST_FALL_e = 0xA0,
PROC_BOOTS_EQUIP_e = 0xA1,
PROC_NOT_USE_e = 0xA2,
PROC_BOTTLE_DRINK_e = 0xA3,
PROC_BOTTLE_OPEN_e = 0xA4,
PROC_BOTTLE_SWING_e = 0xA5,
PROC_BOTTLE_GET_e = 0xA6,
PROC_FOOD_THROW_e = 0xA7,
PROC_FOOD_SET_e = 0xA8,
DPROC_TOOL_e = 0xA9,
DPROC_TALK_e = 0xAA,
DPROC_DAMAGE_e = 0xAB,
DPROC_HOLDUP_e = 0xAC,
DPROC_OPEN_TREASURE_e = 0xAD,
DPROC_GET_ITEM_e = 0xAE,
DPROC_UNEQUIP_e = 0xAF,
DPROC_LAVA_DAMAGE_e = 0xB0,
DPROC_FREEZE_DAMAGE_e = 0xB1,
DPROC_DEAD_e = 0xB2,
DPROC_LOOK_AROUND_e = 0xB3,
DPROC_SALUTE_e = 0xB4,
DPROC_LOOK_AROUND2_e = 0xB5,
DPROC_TALISMAN_PICKUP_e = 0xB6,
DPROC_TALISMAN_WAIT_e = 0xB7,
DPROC_SURPRISED_e = 0xB8,
DPROC_TURN_BACK_e = 0xB9,
DPROC_LOOK_UP_e = 0xBA,
DPROC_QUAKE_WAIT_e = 0xBB,
DPROC_DANCE_e = 0xBC,
DPROC_CAUGHT_e = 0xBD,
DPROC_LOOK_WAIT_e = 0xBE,
DPROC_PUSH_PULL_WAIT_e = 0xBF,
DPROC_PUSH_MOVE_e = 0xC0,
DPROC_DOOR_OPEN_e = 0xC1,
DPROC_NOD_e = 0xC2,
DPROC_PRESENT_e = 0xC3,
DPROC_WIND_CHANGE_e = 0xC4,
DPROC_STAND_ITEM_PUT_e = 0xC5,
DPROC_VORCANO_FAIL_e = 0xC6,
DPROC_SLIGHT_SURPRISED_e = 0xC7,
DPROC_SMILE_e = 0xC8,
DPROC_BOSS_WARP_e = 0xC9,
DPROC_AGB_USE_e = 0xCA,
DPROC_LOOK_TURN_e = 0xCB,
DPROC_LETTER_OPEN_e = 0xCC,
DPROC_LETTER_READ_e = 0xCD,
DPROC_REDEAD_STOP_e = 0xCE,
DPROC_REDEAD_CATCH_e = 0xCF,
DPROC_GET_DANCE_e = 0xD0,
DPROC_BOTTLE_OPEN_FAIRY_e = 0xD1,
DPROC_WARP_SHORT_e = 0xD2,
DPROC_OPEN_SALVAGE_TREASURE_e = 0xD3,
DPROC_SURPRISED_WAIT_e = 0xD4,
DPROC_POWER_UP_WAIT_e = 0xD5,
DPROC_POWER_UP_e = 0xD6,
DPROC_SHIP_SIT_e = 0xD7,
DPROC_LAST_COMBO_e = 0xD8,
DPROC_HAND_UP_e = 0xD9,
DPROC_ICE_SLIP_e = 0xDA,
};
enum daPy_HEAP_TYPE {};
@@ -1829,11 +2049,11 @@ public:
virtual BOOL checkPlayerGuard() const;
virtual fopAc_ac_c* getGrabMissActor();
virtual BOOL checkPlayerFly() const { return mProcFlags & 0x10452822; } // TODO add enum
virtual BOOL checkFrontRoll() const { return mCurProcID == 0x1E; } // TODO add enum
virtual BOOL checkBottleSwing() const { return mCurProcID == 0xA5; }
virtual BOOL checkCutCharge() const { return mCurProcID == 0x59; }
virtual BOOL checkFrontRoll() const { return mCurProcID == PROC_FRONT_ROLL_e; }
virtual BOOL checkBottleSwing() const { return mCurProcID == PROC_BOTTLE_SWING_e; }
virtual BOOL checkCutCharge() const { return mCurProcID == PROC_CUT_TURN_MOVE_e; }
virtual BOOL getBokoFlamePos(cXyz*);
virtual BOOL checkTactWait() const { return mCurProcID == 0x9A; }
virtual BOOL checkTactWait() const { return mCurProcID == PROC_TACT_WAIT_e; }
virtual void setTactZev(unsigned int, int, char*);
virtual void onDekuSpReturnFlg(u8);
virtual bool checkComboCutTurn() const;
src/d/actor/d_a_player_main.cpp
+241 -241
View File
@@ -24,225 +24,225 @@
char l_arcName[] = "Link";
daPy_lk_c::ProcInitTableEntry daPy_lk_c::mProcInitTable[0xDB] = {
{&daPy_lk_c::procScope, 0x00000001},
{&daPy_lk_c::procSubjectivity, 0x20001005},
{&daPy_lk_c::procCall, 0x00000181},
{&daPy_lk_c::procControllWait, 0x00000001},
{&daPy_lk_c::procWait, 0x000211C5},
{&daPy_lk_c::procFreeWait, 0x00020445},
{&daPy_lk_c::procMove, 0x000211C4},
{&daPy_lk_c::procAtnMove, 0x000211C4},
{&daPy_lk_c::procAtnActorWait, 0x000211C5},
{&daPy_lk_c::procAtnActorMove, 0x000211C4},
{&daPy_lk_c::procSideStep, 0x000014C6},
{&daPy_lk_c::procSideStepLand, 0x000010C5},
{&daPy_lk_c::procCrouchDefense, 0x68800101},
{&daPy_lk_c::procCrouchDefenseSlip, 0x60800400},
{&daPy_lk_c::procCrouch, 0x00800101},
{&daPy_lk_c::procCrawlStart, 0x03008100},
{&daPy_lk_c::procCrawlMove, 0x0B008100},
{&daPy_lk_c::procCrawlAutoMove, 0x0F008100},
{&daPy_lk_c::procCrawlEnd, 0x03008000},
{&daPy_lk_c::procWHideReady, 0x00000011},
{&daPy_lk_c::procWHideWait, 0x00000115},
{&daPy_lk_c::procWHideMove, 0x00000014},
{&daPy_lk_c::procWHidePeep, 0x00000415},
{&daPy_lk_c::procWaitTurn, 0x00025145},
{&daPy_lk_c::procMoveTurn, 0x00024044},
{&daPy_lk_c::procSlip, 0x00000100},
{&daPy_lk_c::procSlideFront, 0x00008400},
{&daPy_lk_c::procSlideBack, 0x00000000},
{&daPy_lk_c::procSlideFrontLand, 0x00000404},
{&daPy_lk_c::procSlideBackLand, 0x00000404},
{&daPy_lk_c::procFrontRoll, 0x00008400},
{&daPy_lk_c::procFrontRollCrash, 0x00000402},
{&daPy_lk_c::procNockBackEnd, 0x00008400},
{&daPy_lk_c::procSideRoll, 0x00008400},
{&daPy_lk_c::procBackJump, 0x00000446},
{&daPy_lk_c::procBackJumpLand, 0x00000445},
{&daPy_lk_c::procAutoJump, 0x00005406},
{&daPy_lk_c::procLand, 0x00005005},
{&daPy_lk_c::procLandDamage, 0x00000409},
{&daPy_lk_c::procFall, 0x00001006},
{&daPy_lk_c::procSlowFall, 0x00000002},
{&daPy_lk_c::procSmallJump, 0x00004002},
{&daPy_lk_c::procVerticalJump, 0x00000001},
{&daPy_lk_c::procHangStart, 0x00000421},
{&daPy_lk_c::procHangFallStart, 0x00000421},
{&daPy_lk_c::procHangUp, 0x00000421},
{&daPy_lk_c::procHangWait, 0x00000121},
{&daPy_lk_c::procHangMove, 0x00000120},
{&daPy_lk_c::procHangClimb, 0x00000420},
{&daPy_lk_c::procHangWallCatch, 0x00000020},
{&daPy_lk_c::procPushPullWait, 0x00200101},
{&daPy_lk_c::procPushMove, 0x00200000},
{&daPy_lk_c::procPullMove, 0x00200400},
{&daPy_lk_c::procSwimUp, 0x04040400},
{&daPy_lk_c::procSwimWait, 0x04040181},
{&daPy_lk_c::procSwimMove, 0x04040480},
{&daPy_lk_c::procLadderUpStart, 0x00400400},
{&daPy_lk_c::procLadderUpEnd, 0x00400400},
{&daPy_lk_c::procLadderDownStart, 0x00400400},
{&daPy_lk_c::procLadderDownEnd, 0x00400400},
{&daPy_lk_c::procLadderMove, 0x00400100},
{&daPy_lk_c::procClimbUpStart, 0x00010400},
{&daPy_lk_c::procClimbDownStart, 0x00010400},
{&daPy_lk_c::procClimbMoveUpDown, 0x00010100},
{&daPy_lk_c::procClimbMoveSide, 0x00010100},
{&daPy_lk_c::procCutA, 0x00000480},
{&daPy_lk_c::procCutF, 0x00000480},
{&daPy_lk_c::procCutR, 0x00000480},
{&daPy_lk_c::procCutL, 0x00000480},
{&daPy_lk_c::procCutEA, 0x00000480},
{&daPy_lk_c::procCutEB, 0x00000480},
{&daPy_lk_c::procCutExA, 0x00000400},
{&daPy_lk_c::procCutExB, 0x00000400},
{&daPy_lk_c::procCutExMJ, 0x08000402},
{&daPy_lk_c::procCutKesa, 0x00000400},
{&daPy_lk_c::procWeaponNormalSwing, 0x00000480},
{&daPy_lk_c::procWeaponSideSwing, 0x08000400},
{&daPy_lk_c::procWeaponFrontSwingReady, 0x08000400},
{&daPy_lk_c::procWeaponFrontSwing, 0x08000400},
{&daPy_lk_c::procWeaponFrontSwingEnd, 0x08000400},
{&daPy_lk_c::procWeaponThrow, 0x00000480},
{&daPy_lk_c::procHammerSideSwing, 0x08000400},
{&daPy_lk_c::procHammerFrontSwingReady, 0x08000400},
{&daPy_lk_c::procHammerFrontSwing, 0x08000400},
{&daPy_lk_c::procHammerFrontSwingEnd, 0x08000400},
{&daPy_lk_c::procCutTurn, 0x00000400},
{&daPy_lk_c::procCutRoll, 0x00000400},
{&daPy_lk_c::procCutRollEnd, 0x00000101},
{&daPy_lk_c::procCutTurnCharge, 0x00000400},
{&daPy_lk_c::procCutTurnMove, 0x00000080},
{&daPy_lk_c::procCutReverse, 0x00000400},
{&daPy_lk_c::procJumpCut, 0x08000402},
{&daPy_lk_c::procJumpCutLand, 0x08000401},
{&daPy_lk_c::procBtJump, 0x88000402},
{&daPy_lk_c::procBtJumpCut, 0x80000402},
{&daPy_lk_c::procBtSlide, 0x80000000},
{&daPy_lk_c::procBtRoll, 0x80008400},
{&daPy_lk_c::procBtRollCut, 0x88000402},
{&daPy_lk_c::procBtVerticalJump, 0x88000402},
{&daPy_lk_c::procBtVerticalJumpCut, 0x88000402},
{&daPy_lk_c::procBtVerticalJumpLand, 0x00000400},
{&daPy_lk_c::procGuardCrash, 0x00000000},
{&daPy_lk_c::procDamage, 0x00000488},
{&daPy_lk_c::procPolyDamage, 0x00000408},
{&daPy_lk_c::procLargeDamage, 0x0000000A},
{&daPy_lk_c::procLargeDamageUp, 0x0A008408},
{&daPy_lk_c::procLargeDamageWall, 0x0000040A},
{&daPy_lk_c::procLavaDamage, 0x0000000A},
{&daPy_lk_c::procElecDamage, 0x00008009},
{&daPy_lk_c::procGuardSlip, 0x00001480},
{&daPy_lk_c::procGrabReady, 0x00100401},
{&daPy_lk_c::procGrabUp, 0x00100401},
{&daPy_lk_c::procGrabMiss, 0x00100401},
{&daPy_lk_c::procGrabThrow, 0x00100401},
{&daPy_lk_c::procGrabPut, 0x00100401},
{&daPy_lk_c::procGrabWait, 0x00104181},
{&daPy_lk_c::procGrabHeavyWait, 0x00100181},
{&daPy_lk_c::procGrabRebound, 0x00100401},
{&daPy_lk_c::procRopeSubject, 0x20001005},
{&daPy_lk_c::procRopeReady, 0x04000800},
{&daPy_lk_c::procRopeSwing, 0x04000C00},
{&daPy_lk_c::procRopeHangWait, 0x04000901},
{&daPy_lk_c::procRopeUp, 0x04000800},
{&daPy_lk_c::procRopeDown, 0x04000800},
{&daPy_lk_c::procRopeSwingStart, 0x04000C00},
{&daPy_lk_c::procRopeMove, 0x20001104},
{&daPy_lk_c::procRopeThrowCatch, 0x00000401},
{&daPy_lk_c::procRopeUpHang, 0x04000800},
{&daPy_lk_c::procBoomerangSubject, 0x20021105},
{&daPy_lk_c::procBoomerangMove, 0x20021104},
{&daPy_lk_c::procBoomerangCatch, 0x00001401},
{&daPy_lk_c::procHookshotSubject, 0x20001305},
{&daPy_lk_c::procHookshotMove, 0x20001304},
{&daPy_lk_c::procHookshotFly, 0x00000202},
{&daPy_lk_c::procShipReady, 0x00002420},
{&daPy_lk_c::procShipJumpRide, 0x00002400},
{&daPy_lk_c::procShipSteer, 0x40002180},
{&daPy_lk_c::procShipPaddle, 0x40002180},
{&daPy_lk_c::procShipScope, 0x40002100},
{&daPy_lk_c::procShipBoomerang, 0x60022100},
{&daPy_lk_c::procShipHookshot, 0x60002100},
{&daPy_lk_c::procShipBow, 0x60002100},
{&daPy_lk_c::procShipCannon, 0x40002100},
{&daPy_lk_c::procShipCrane, 0x08002180},
{&daPy_lk_c::procShipGetOff, 0x00002000},
{&daPy_lk_c::procShipRestart, 0x00002400},
{&daPy_lk_c::procFanSwing, 0x08000400},
{&daPy_lk_c::procFanGlide, 0x00000482},
{&daPy_lk_c::procBowSubject, 0x20001105},
{&daPy_lk_c::procBowMove, 0x20001104},
{&daPy_lk_c::procVomitReady, 0x00000402},
{&daPy_lk_c::procVomitWait, 0x04008001},
{&daPy_lk_c::procVomitJump, 0x00000002},
{&daPy_lk_c::procVomitLand, 0x00000401},
{&daPy_lk_c::procTactWait, 0x08000101},
{&daPy_lk_c::procTactPlay, 0x08000401},
{&daPy_lk_c::procTactPlayEnd, 0x00000101},
{&daPy_lk_c::procTactPlayOriginal, 0x00000001},
{&daPy_lk_c::procIceSlipFall, 0x00000002},
{&daPy_lk_c::procIceSlipFallUp, 0x0A008400},
{&daPy_lk_c::procIceSlipAlmostFall, 0x00000001},
{&daPy_lk_c::procBootsEquip, 0x08004403},
{&daPy_lk_c::procNotUse, 0x00000401},
{&daPy_lk_c::procBottleDrink, 0x00000401},
{&daPy_lk_c::procBottleOpen, 0x00000401},
{&daPy_lk_c::procBottleSwing, 0x00000401},
{&daPy_lk_c::procBottleGet, 0x00000401},
{&daPy_lk_c::procFoodThrow, 0x00000101},
{&daPy_lk_c::procFoodSet, 0x00000401},
{&daPy_lk_c::dProcTool, 0x00008000},
{&daPy_lk_c::dProcTalk, 0x00080181},
{&daPy_lk_c::dProcDamage, 0x00000401},
{&daPy_lk_c::dProcHoldup, 0x00004001},
{&daPy_lk_c::dProcOpenTreasure, 0x00008401},
{&daPy_lk_c::dProcGetItem, 0x00008001},
{&daPy_lk_c::dProcUnequip, 0x00000101},
{&daPy_lk_c::dProcLavaDamage, 0x0000000A},
{&daPy_lk_c::dProcFreezeDamage, 0x0000400A},
{&daPy_lk_c::dProcDead, 0x00008409},
{&daPy_lk_c::dProcLookAround, 0x00000401},
{&daPy_lk_c::dProcSalute, 0x00000401},
{&daPy_lk_c::dProcLookAround2, 0x00080401},
{&daPy_lk_c::dProcTalismanPickup, 0x00080401},
{&daPy_lk_c::dProcTalismanWait, 0x00080101},
{&daPy_lk_c::dProcSurprised, 0x00000401},
{&daPy_lk_c::dProcTurnBack, 0x00004401},
{&daPy_lk_c::dProcLookUp, 0x00000401},
{&daPy_lk_c::dProcQuakeWait, 0x00000401},
{&daPy_lk_c::dProcDance, 0x00000401},
{&daPy_lk_c::dProcCaught, 0x10000000},
{&daPy_lk_c::dProcLookWait, 0x00001181},
{&daPy_lk_c::dProcPushPullWait, 0x00200101},
{&daPy_lk_c::dProcPushMove, 0x00200000},
{&daPy_lk_c::dProcDoorOpen, 0x00000400},
{&daPy_lk_c::dProcNod, 0x00080481},
{&daPy_lk_c::dProcPresent, 0x00080001},
{&daPy_lk_c::dProcWindChange, 0x00000401},
{&daPy_lk_c::dProcStandItemPut, 0x00000001},
{&daPy_lk_c::dProcVorcanoFail, 0x00000002},
{&daPy_lk_c::dProcSlightSurprised, 0x00000401},
{&daPy_lk_c::dProcSmile, 0x00000001},
{&daPy_lk_c::dProcBossWarp, 0x00000402},
{&daPy_lk_c::dProcAgbUse, 0x00000101},
{&daPy_lk_c::dProcLookTurn, 0x00000401},
{&daPy_lk_c::dProcLetterOpen, 0x00000101},
{&daPy_lk_c::dProcLetterRead, 0x00000101},
{&daPy_lk_c::dProcRedeadStop, 0x08000401},
{&daPy_lk_c::dProcRedeadCatch, 0x00000401},
{&daPy_lk_c::dProcGetDance, 0x00008401},
{&daPy_lk_c::dProcBottleOpenFairy, 0x00000401},
{&daPy_lk_c::dProcWarpShort, 0x00000102},
{&daPy_lk_c::dProcOpenSalvageTreasure, 0x00000401},
{&daPy_lk_c::dProcSurprisedWait, 0x00000001},
{&daPy_lk_c::dProcPowerUpWait_init, 0x00008401},
{&daPy_lk_c::dProcPowerUp, 0x00008401},
{&daPy_lk_c::dProcShipSit, 0x00082181},
{&daPy_lk_c::dProcLastCombo, 0x00008001},
{&daPy_lk_c::dProcHandUp, 0x00080181},
{&daPy_lk_c::dProcIceSlip, 0x00000401},
/* 0x00 */ {&daPy_lk_c::procScope, 0x00000001},
/* 0x01 */ {&daPy_lk_c::procSubjectivity, 0x20001005},
/* 0x02 */ {&daPy_lk_c::procCall, 0x00000181},
/* 0x03 */ {&daPy_lk_c::procControllWait, 0x00000001},
/* 0x04 */ {&daPy_lk_c::procWait, 0x000211C5},
/* 0x05 */ {&daPy_lk_c::procFreeWait, 0x00020445},
/* 0x06 */ {&daPy_lk_c::procMove, 0x000211C4},
/* 0x07 */ {&daPy_lk_c::procAtnMove, 0x000211C4},
/* 0x08 */ {&daPy_lk_c::procAtnActorWait, 0x000211C5},
/* 0x09 */ {&daPy_lk_c::procAtnActorMove, 0x000211C4},
/* 0x0A */ {&daPy_lk_c::procSideStep, 0x000014C6},
/* 0x0B */ {&daPy_lk_c::procSideStepLand, 0x000010C5},
/* 0x0C */ {&daPy_lk_c::procCrouchDefense, 0x68800101},
/* 0x0D */ {&daPy_lk_c::procCrouchDefenseSlip, 0x60800400},
/* 0x0E */ {&daPy_lk_c::procCrouch, 0x00800101},
/* 0x0F */ {&daPy_lk_c::procCrawlStart, 0x03008100},
/* 0x10 */ {&daPy_lk_c::procCrawlMove, 0x0B008100},
/* 0x11 */ {&daPy_lk_c::procCrawlAutoMove, 0x0F008100},
/* 0x12 */ {&daPy_lk_c::procCrawlEnd, 0x03008000},
/* 0x13 */ {&daPy_lk_c::procWHideReady, 0x00000011},
/* 0x14 */ {&daPy_lk_c::procWHideWait, 0x00000115},
/* 0x15 */ {&daPy_lk_c::procWHideMove, 0x00000014},
/* 0x16 */ {&daPy_lk_c::procWHidePeep, 0x00000415},
/* 0x17 */ {&daPy_lk_c::procWaitTurn, 0x00025145},
/* 0x18 */ {&daPy_lk_c::procMoveTurn, 0x00024044},
/* 0x19 */ {&daPy_lk_c::procSlip, 0x00000100},
/* 0x1A */ {&daPy_lk_c::procSlideFront, 0x00008400},
/* 0x1B */ {&daPy_lk_c::procSlideBack, 0x00000000},
/* 0x1C */ {&daPy_lk_c::procSlideFrontLand, 0x00000404},
/* 0x1D */ {&daPy_lk_c::procSlideBackLand, 0x00000404},
/* 0x1E */ {&daPy_lk_c::procFrontRoll, 0x00008400},
/* 0x1F */ {&daPy_lk_c::procFrontRollCrash, 0x00000402},
/* 0x20 */ {&daPy_lk_c::procNockBackEnd, 0x00008400},
/* 0x21 */ {&daPy_lk_c::procSideRoll, 0x00008400},
/* 0x22 */ {&daPy_lk_c::procBackJump, 0x00000446},
/* 0x23 */ {&daPy_lk_c::procBackJumpLand, 0x00000445},
/* 0x24 */ {&daPy_lk_c::procAutoJump, 0x00005406},
/* 0x25 */ {&daPy_lk_c::procLand, 0x00005005},
/* 0x26 */ {&daPy_lk_c::procLandDamage, 0x00000409},
/* 0x27 */ {&daPy_lk_c::procFall, 0x00001006},
/* 0x28 */ {&daPy_lk_c::procSlowFall, 0x00000002},
/* 0x29 */ {&daPy_lk_c::procSmallJump, 0x00004002},
/* 0x2A */ {&daPy_lk_c::procVerticalJump, 0x00000001},
/* 0x2B */ {&daPy_lk_c::procHangStart, 0x00000421},
/* 0x2C */ {&daPy_lk_c::procHangFallStart, 0x00000421},
/* 0x2D */ {&daPy_lk_c::procHangUp, 0x00000421},
/* 0x2E */ {&daPy_lk_c::procHangWait, 0x00000121},
/* 0x2F */ {&daPy_lk_c::procHangMove, 0x00000120},
/* 0x30 */ {&daPy_lk_c::procHangClimb, 0x00000420},
/* 0x31 */ {&daPy_lk_c::procHangWallCatch, 0x00000020},
/* 0x32 */ {&daPy_lk_c::procPushPullWait, 0x00200101},
/* 0x33 */ {&daPy_lk_c::procPushMove, 0x00200000},
/* 0x34 */ {&daPy_lk_c::procPullMove, 0x00200400},
/* 0x35 */ {&daPy_lk_c::procSwimUp, 0x04040400},
/* 0x36 */ {&daPy_lk_c::procSwimWait, 0x04040181},
/* 0x37 */ {&daPy_lk_c::procSwimMove, 0x04040480},
/* 0x38 */ {&daPy_lk_c::procLadderUpStart, 0x00400400},
/* 0x39 */ {&daPy_lk_c::procLadderUpEnd, 0x00400400},
/* 0x3A */ {&daPy_lk_c::procLadderDownStart, 0x00400400},
/* 0x3B */ {&daPy_lk_c::procLadderDownEnd, 0x00400400},
/* 0x3C */ {&daPy_lk_c::procLadderMove, 0x00400100},
/* 0x3D */ {&daPy_lk_c::procClimbUpStart, 0x00010400},
/* 0x3E */ {&daPy_lk_c::procClimbDownStart, 0x00010400},
/* 0x3F */ {&daPy_lk_c::procClimbMoveUpDown, 0x00010100},
/* 0x40 */ {&daPy_lk_c::procClimbMoveSide, 0x00010100},
/* 0x41 */ {&daPy_lk_c::procCutA, 0x00000480},
/* 0x42 */ {&daPy_lk_c::procCutF, 0x00000480},
/* 0x43 */ {&daPy_lk_c::procCutR, 0x00000480},
/* 0x44 */ {&daPy_lk_c::procCutL, 0x00000480},
/* 0x45 */ {&daPy_lk_c::procCutEA, 0x00000480},
/* 0x46 */ {&daPy_lk_c::procCutEB, 0x00000480},
/* 0x47 */ {&daPy_lk_c::procCutExA, 0x00000400},
/* 0x48 */ {&daPy_lk_c::procCutExB, 0x00000400},
/* 0x49 */ {&daPy_lk_c::procCutExMJ, 0x08000402},
/* 0x4A */ {&daPy_lk_c::procCutKesa, 0x00000400},
/* 0x4B */ {&daPy_lk_c::procWeaponNormalSwing, 0x00000480},
/* 0x4C */ {&daPy_lk_c::procWeaponSideSwing, 0x08000400},
/* 0x4D */ {&daPy_lk_c::procWeaponFrontSwingReady, 0x08000400},
/* 0x4E */ {&daPy_lk_c::procWeaponFrontSwing, 0x08000400},
/* 0x4F */ {&daPy_lk_c::procWeaponFrontSwingEnd, 0x08000400},
/* 0x50 */ {&daPy_lk_c::procWeaponThrow, 0x00000480},
/* 0x51 */ {&daPy_lk_c::procHammerSideSwing, 0x08000400},
/* 0x52 */ {&daPy_lk_c::procHammerFrontSwingReady, 0x08000400},
/* 0x53 */ {&daPy_lk_c::procHammerFrontSwing, 0x08000400},
/* 0x54 */ {&daPy_lk_c::procHammerFrontSwingEnd, 0x08000400},
/* 0x55 */ {&daPy_lk_c::procCutTurn, 0x00000400},
/* 0x56 */ {&daPy_lk_c::procCutRoll, 0x00000400},
/* 0x57 */ {&daPy_lk_c::procCutRollEnd, 0x00000101},
/* 0x58 */ {&daPy_lk_c::procCutTurnCharge, 0x00000400},
/* 0x59 */ {&daPy_lk_c::procCutTurnMove, 0x00000080},
/* 0x5A */ {&daPy_lk_c::procCutReverse, 0x00000400},
/* 0x5B */ {&daPy_lk_c::procJumpCut, 0x08000402},
/* 0x5C */ {&daPy_lk_c::procJumpCutLand, 0x08000401},
/* 0x5D */ {&daPy_lk_c::procBtJump, 0x88000402},
/* 0x5E */ {&daPy_lk_c::procBtJumpCut, 0x80000402},
/* 0x5F */ {&daPy_lk_c::procBtSlide, 0x80000000},
/* 0x60 */ {&daPy_lk_c::procBtRoll, 0x80008400},
/* 0x61 */ {&daPy_lk_c::procBtRollCut, 0x88000402},
/* 0x62 */ {&daPy_lk_c::procBtVerticalJump, 0x88000402},
/* 0x63 */ {&daPy_lk_c::procBtVerticalJumpCut, 0x88000402},
/* 0x64 */ {&daPy_lk_c::procBtVerticalJumpLand, 0x00000400},
/* 0x65 */ {&daPy_lk_c::procGuardCrash, 0x00000000},
/* 0x66 */ {&daPy_lk_c::procDamage, 0x00000488},
/* 0x67 */ {&daPy_lk_c::procPolyDamage, 0x00000408},
/* 0x68 */ {&daPy_lk_c::procLargeDamage, 0x0000000A},
/* 0x69 */ {&daPy_lk_c::procLargeDamageUp, 0x0A008408},
/* 0x6A */ {&daPy_lk_c::procLargeDamageWall, 0x0000040A},
/* 0x6B */ {&daPy_lk_c::procLavaDamage, 0x0000000A},
/* 0x6C */ {&daPy_lk_c::procElecDamage, 0x00008009},
/* 0x6D */ {&daPy_lk_c::procGuardSlip, 0x00001480},
/* 0x6E */ {&daPy_lk_c::procGrabReady, 0x00100401},
/* 0x6F */ {&daPy_lk_c::procGrabUp, 0x00100401},
/* 0x70 */ {&daPy_lk_c::procGrabMiss, 0x00100401},
/* 0x71 */ {&daPy_lk_c::procGrabThrow, 0x00100401},
/* 0x72 */ {&daPy_lk_c::procGrabPut, 0x00100401},
/* 0x73 */ {&daPy_lk_c::procGrabWait, 0x00104181},
/* 0x74 */ {&daPy_lk_c::procGrabHeavyWait, 0x00100181},
/* 0x75 */ {&daPy_lk_c::procGrabRebound, 0x00100401},
/* 0x76 */ {&daPy_lk_c::procRopeSubject, 0x20001005},
/* 0x77 */ {&daPy_lk_c::procRopeReady, 0x04000800},
/* 0x78 */ {&daPy_lk_c::procRopeSwing, 0x04000C00},
/* 0x79 */ {&daPy_lk_c::procRopeHangWait, 0x04000901},
/* 0x7A */ {&daPy_lk_c::procRopeUp, 0x04000800},
/* 0x7B */ {&daPy_lk_c::procRopeDown, 0x04000800},
/* 0x7C */ {&daPy_lk_c::procRopeSwingStart, 0x04000C00},
/* 0x7D */ {&daPy_lk_c::procRopeMove, 0x20001104},
/* 0x7E */ {&daPy_lk_c::procRopeThrowCatch, 0x00000401},
/* 0x7F */ {&daPy_lk_c::procRopeUpHang, 0x04000800},
/* 0x80 */ {&daPy_lk_c::procBoomerangSubject, 0x20021105},
/* 0x81 */ {&daPy_lk_c::procBoomerangMove, 0x20021104},
/* 0x82 */ {&daPy_lk_c::procBoomerangCatch, 0x00001401},
/* 0x83 */ {&daPy_lk_c::procHookshotSubject, 0x20001305},
/* 0x84 */ {&daPy_lk_c::procHookshotMove, 0x20001304},
/* 0x85 */ {&daPy_lk_c::procHookshotFly, 0x00000202},
/* 0x86 */ {&daPy_lk_c::procShipReady, 0x00002420},
/* 0x87 */ {&daPy_lk_c::procShipJumpRide, 0x00002400},
/* 0x88 */ {&daPy_lk_c::procShipSteer, 0x40002180},
/* 0x89 */ {&daPy_lk_c::procShipPaddle, 0x40002180},
/* 0x8A */ {&daPy_lk_c::procShipScope, 0x40002100},
/* 0x8B */ {&daPy_lk_c::procShipBoomerang, 0x60022100},
/* 0x8C */ {&daPy_lk_c::procShipHookshot, 0x60002100},
/* 0x8D */ {&daPy_lk_c::procShipBow, 0x60002100},
/* 0x8E */ {&daPy_lk_c::procShipCannon, 0x40002100},
/* 0x8F */ {&daPy_lk_c::procShipCrane, 0x08002180},
/* 0x90 */ {&daPy_lk_c::procShipGetOff, 0x00002000},
/* 0x91 */ {&daPy_lk_c::procShipRestart, 0x00002400},
/* 0x92 */ {&daPy_lk_c::procFanSwing, 0x08000400},
/* 0x93 */ {&daPy_lk_c::procFanGlide, 0x00000482},
/* 0x94 */ {&daPy_lk_c::procBowSubject, 0x20001105},
/* 0x95 */ {&daPy_lk_c::procBowMove, 0x20001104},
/* 0x96 */ {&daPy_lk_c::procVomitReady, 0x00000402},
/* 0x97 */ {&daPy_lk_c::procVomitWait, 0x04008001},
/* 0x98 */ {&daPy_lk_c::procVomitJump, 0x00000002},
/* 0x99 */ {&daPy_lk_c::procVomitLand, 0x00000401},
/* 0x9A */ {&daPy_lk_c::procTactWait, 0x08000101},
/* 0x9B */ {&daPy_lk_c::procTactPlay, 0x08000401},
/* 0x9C */ {&daPy_lk_c::procTactPlayEnd, 0x00000101},
/* 0x9D */ {&daPy_lk_c::procTactPlayOriginal, 0x00000001},
/* 0x9E */ {&daPy_lk_c::procIceSlipFall, 0x00000002},
/* 0x9F */ {&daPy_lk_c::procIceSlipFallUp, 0x0A008400},
/* 0xA0 */ {&daPy_lk_c::procIceSlipAlmostFall, 0x00000001},
/* 0xA1 */ {&daPy_lk_c::procBootsEquip, 0x08004403},
/* 0xA2 */ {&daPy_lk_c::procNotUse, 0x00000401},
/* 0xA3 */ {&daPy_lk_c::procBottleDrink, 0x00000401},
/* 0xA4 */ {&daPy_lk_c::procBottleOpen, 0x00000401},
/* 0xA5 */ {&daPy_lk_c::procBottleSwing, 0x00000401},
/* 0xA6 */ {&daPy_lk_c::procBottleGet, 0x00000401},
/* 0xA7 */ {&daPy_lk_c::procFoodThrow, 0x00000101},
/* 0xA8 */ {&daPy_lk_c::procFoodSet, 0x00000401},
/* 0xA9 */ {&daPy_lk_c::dProcTool, 0x00008000},
/* 0xAA */ {&daPy_lk_c::dProcTalk, 0x00080181},
/* 0xAB */ {&daPy_lk_c::dProcDamage, 0x00000401},
/* 0xAC */ {&daPy_lk_c::dProcHoldup, 0x00004001},
/* 0xAD */ {&daPy_lk_c::dProcOpenTreasure, 0x00008401},
/* 0xAE */ {&daPy_lk_c::dProcGetItem, 0x00008001},
/* 0xAF */ {&daPy_lk_c::dProcUnequip, 0x00000101},
/* 0xB0 */ {&daPy_lk_c::dProcLavaDamage, 0x0000000A},
/* 0xB1 */ {&daPy_lk_c::dProcFreezeDamage, 0x0000400A},
/* 0xB2 */ {&daPy_lk_c::dProcDead, 0x00008409},
/* 0xB3 */ {&daPy_lk_c::dProcLookAround, 0x00000401},
/* 0xB4 */ {&daPy_lk_c::dProcSalute, 0x00000401},
/* 0xB5 */ {&daPy_lk_c::dProcLookAround2, 0x00080401},
/* 0xB6 */ {&daPy_lk_c::dProcTalismanPickup, 0x00080401},
/* 0xB7 */ {&daPy_lk_c::dProcTalismanWait, 0x00080101},
/* 0xB8 */ {&daPy_lk_c::dProcSurprised, 0x00000401},
/* 0xB9 */ {&daPy_lk_c::dProcTurnBack, 0x00004401},
/* 0xBA */ {&daPy_lk_c::dProcLookUp, 0x00000401},
/* 0xBB */ {&daPy_lk_c::dProcQuakeWait, 0x00000401},
/* 0xBC */ {&daPy_lk_c::dProcDance, 0x00000401},
/* 0xBD */ {&daPy_lk_c::dProcCaught, 0x10000000},
/* 0xBE */ {&daPy_lk_c::dProcLookWait, 0x00001181},
/* 0xBF */ {&daPy_lk_c::dProcPushPullWait, 0x00200101},
/* 0xC0 */ {&daPy_lk_c::dProcPushMove, 0x00200000},
/* 0xC1 */ {&daPy_lk_c::dProcDoorOpen, 0x00000400},
/* 0xC2 */ {&daPy_lk_c::dProcNod, 0x00080481},
/* 0xC3 */ {&daPy_lk_c::dProcPresent, 0x00080001},
/* 0xC4 */ {&daPy_lk_c::dProcWindChange, 0x00000401},
/* 0xC5 */ {&daPy_lk_c::dProcStandItemPut, 0x00000001},
/* 0xC6 */ {&daPy_lk_c::dProcVorcanoFail, 0x00000002},
/* 0xC7 */ {&daPy_lk_c::dProcSlightSurprised, 0x00000401},
/* 0xC8 */ {&daPy_lk_c::dProcSmile, 0x00000001},
/* 0xC9 */ {&daPy_lk_c::dProcBossWarp, 0x00000402},
/* 0xCA */ {&daPy_lk_c::dProcAgbUse, 0x00000101},
/* 0xCB */ {&daPy_lk_c::dProcLookTurn, 0x00000401},
/* 0xCC */ {&daPy_lk_c::dProcLetterOpen, 0x00000101},
/* 0xCD */ {&daPy_lk_c::dProcLetterRead, 0x00000101},
/* 0xCE */ {&daPy_lk_c::dProcRedeadStop, 0x08000401},
/* 0xCF */ {&daPy_lk_c::dProcRedeadCatch, 0x00000401},
/* 0xD0 */ {&daPy_lk_c::dProcGetDance, 0x00008401},
/* 0xD1 */ {&daPy_lk_c::dProcBottleOpenFairy, 0x00000401},
/* 0xD2 */ {&daPy_lk_c::dProcWarpShort, 0x00000102},
/* 0xD3 */ {&daPy_lk_c::dProcOpenSalvageTreasure, 0x00000401},
/* 0xD4 */ {&daPy_lk_c::dProcSurprisedWait, 0x00000001},
/* 0xD5 */ {&daPy_lk_c::dProcPowerUpWait_init, 0x00008401},
/* 0xD6 */ {&daPy_lk_c::dProcPowerUp, 0x00008401},
/* 0xD7 */ {&daPy_lk_c::dProcShipSit, 0x00082181},
/* 0xD8 */ {&daPy_lk_c::dProcLastCombo, 0x00008001},
/* 0xD9 */ {&daPy_lk_c::dProcHandUp, 0x00080181},
/* 0xDA */ {&daPy_lk_c::dProcIceSlip, 0x00000401},
};
daPy_lk_c::daPy_ProcFunc daPy_lk_c::mDemoProcInitFuncTable[0x4B] = {
@@ -1103,16 +1103,16 @@ BOOL daPy_lk_c::commonProcInit(daPy_lk_c::daPy_PROC procID) {
BOOL resetDemoAnime = FALSE;
s32 temp_r28;
if (mCurProcID == 0x19) {
if (mCurProcID == PROC_SLIP_e) {
mDoAud_seStop(JA_SE_LK_RUN_SLIP, 0);
} else if (mCurProcID == 0x70 || (mCurProcID == 0x6E && procID != 0x70)) {
} else if (mCurProcID == PROC_GRAB_MISS_e || (mCurProcID == PROC_GRAB_READY_e && procID != PROC_GRAB_MISS_e)) {
mActorKeepRope.clearData();
} else if (mCurProcID == 0xB7) {
} else if (mCurProcID == DPROC_TALISMAN_WAIT_e) {
seStartOnlyReverb(JA_SE_LK_ITEM_TAKEOUT);
mpHeldItemModel = NULL;
} else if (mCurProcID == 0x92) {
} else if (mCurProcID == PROC_FAN_SWING_e) {
setSmallFanModel();
} else if (mCurProcID == 0x93) {
} else if (mCurProcID == PROC_FAN_GLIDE_e) {
deleteEquipItem(0);
mMaxFallSpeed = daPy_HIO_autoJump_c0::m.field_0x10;
setSmallFanModel();
@@ -1121,28 +1121,28 @@ BOOL daPy_lk_c::commonProcInit(daPy_lk_c::daPy_PROC procID) {
m3730 = cXyz::Zero;
m34E0 = 0;
m34E4 = 0;
} else if (mCurProcID == 0x28) {
} else if (mCurProcID == PROC_SLOW_FALL_e) {
mMaxFallSpeed = daPy_HIO_autoJump_c0::m.field_0x10;
} else if (mCurProcID == 0xA9) {
} else if (mCurProcID == DPROC_TOOL_e) {
resetDemoAnime = TRUE;
speed.y = 0.0f;
} else if (mCurProcID == 0xAE || mCurProcID == 0xD0) {
} else if (mCurProcID == DPROC_GET_ITEM_e || mCurProcID == DPROC_GET_DANCE_e) {
dKy_Itemgetcol_chg_off();
if (mCurProcID == 0xAE && m34D8 != 0) {
if (mCurProcID == DPROC_GET_ITEM_e && m34D8 != 0) {
m34C2 = 0xB;
}
} else if (mCurProcID == 0xC3 || mCurProcID == 0xA2) {
} else if (mCurProcID == DPROC_PRESENT_e || mCurProcID == PROC_NOT_USE_e) {
daItemBase_c* item = (daItemBase_c*)fopAcM_getItemEventPartner(this);
if (item && (fopAcM_GetName(item) == PROC_ITEM || fopAcM_GetName(item) == PROC_Demo_Item)) {
item->dead();
}
} else if (mCurProcID == 0xCD) {
} else if (mCurProcID == DPROC_LETTER_READ_e) {
deleteEquipItem(0);
} else if (mCurProcID == 0x57) {
} else if (mCurProcID == PROC_CUT_ROLL_END_e) {
if (m33A8.getEmitter()) {
m33A8.getEmitter()->setGlobalAlpha(0);
}
} else if (mCurProcID == 0x8D) {
} else if (mCurProcID == PROC_SHIP_BOW_e) {
deleteArrow();
}
@@ -1215,7 +1215,7 @@ BOOL daPy_lk_c::commonProcInit(daPy_lk_c::daPy_PROC procID) {
m35F4 = m3688.y;
}
if (mCurProcID != 0x37) {
if (mCurProcID != PROC_SWIM_MOVE_e) {
mSwimTailEcallBack[0].onEnd();
mSwimTailEcallBack[1].onEnd();
}
@@ -1252,7 +1252,7 @@ BOOL daPy_lk_c::commonProcInit(daPy_lk_c::daPy_PROC procID) {
m35E8 = 0.0f;
if (!(mProcFlags & 0x800) && mCurProcID != 0x76 && mCurProcID != 0x7D) {
if (!(mProcFlags & 0x800) && mCurProcID != PROC_ROPE_SUBJECT_e && mCurProcID != PROC_ROPE_MOVE_e) {
freeRopeItem();
}
if (!(mProcFlags & 0x200)) {
@@ -1551,7 +1551,7 @@ BOOL daPy_lk_c::procBackJumpLand() {
/* 80115E88-80115EA4 .text checkAutoJumpFlying__9daPy_lk_cCFv */
int daPy_lk_c::checkAutoJumpFlying() const {
return mCurProcID != 0x24 ? -1 : m34D0;
return mCurProcID != PROC_AUTO_JUMP_e ? -1 : m34D0;
}
/* 80115EA4-8011602C .text procAutoJump_init__9daPy_lk_cFv */
@@ -1875,11 +1875,11 @@ void daPy_lk_c::setBgCheckParam() {
mAcchCir[1].SetWallH(89.9f);
mAcchCir[2].SetWallH(125.0f);
if (mCurProcID == 0x7C) {
if (mCurProcID == PROC_ROPE_SWING_START_e) {
mAcchCir[0].SetWallH(-125.0f);
mAcchCir[1].SetWallH(-89.9f);
mAcchCir[2].SetWallH(0.0f);
} else if (mCurProcID == 0x6A || mProcFlags & 0x410000) {
} else if (mCurProcID == PROC_LARGE_DAMAGE_WALL_e || mProcFlags & 0x410000) {
mAcchCir[0].SetWallR(5.0f);
} else if (mProcFlags & 0x200000) {
mAcchCir[0].SetWallR(40.0f);
@@ -1893,7 +1893,7 @@ void daPy_lk_c::setBgCheckParam() {
mAcchCir[0].SetWallH(-5.0f);
mAcchCir[1].SetWallH(0.0f);
mAcchCir[2].SetWallH(20.0f);
} else if (mProcFlags & 0x1000000 && mCurProcID != 0x12) {
} else if (mProcFlags & 0x1000000 && mCurProcID != PROC_CRAWL_END_e) {
mAcchCir[0].SetWallR(30.0f);
mAcchCir[0].SetWallH(10.0f);
mAcchCir[1].SetWallH(50.0f);
@@ -1958,7 +1958,7 @@ BOOL daPy_lk_c::startRestartRoom(u32 param_1, int param_2, f32 param_3, int i_po
return TRUE;
}
if (checkNoResetFlg0(daPyFlg0_UNK10) && mCurProcID != 0xB2) {
if (checkNoResetFlg0(daPyFlg0_UNK10) && mCurProcID != DPROC_DEAD_e) {
i_point = m34CB;
} else {
i_point = m3594;
@@ -1998,7 +1998,7 @@ BOOL daPy_lk_c::startRestartRoom(u32 param_1, int param_2, f32 param_3, int i_po
dStage_changeScene(scls_idx, 0.0f, param_1, -1);
} else {
if (mCurProcID == 0xB2) {
if (mCurProcID == DPROC_DEAD_e) {
dStage_changeScene(0, 0.0f, param_1, -1);
} else {
int roomNo = dComIfGs_getRestartRoomNo();
@@ -2014,7 +2014,7 @@ BOOL daPy_lk_c::startRestartRoom(u32 param_1, int param_2, f32 param_3, int i_po
dComIfGp_setNextStage(dComIfGp_getStartStageName(), i_point, current.roomNo, -1, 0.0f, param_1, 1, 0);
}
if (mCurProcID != 0xB2) {
if (mCurProcID != DPROC_DEAD_e) {
u32 roomParam = setParamData(-1, 0, param_2, 0);
dComIfGs_setRestartRoomParam(roomParam);
mDoAud_seStart(JA_SE_FORCE_BACK, NULL, 0, 0);