Match Link's HIO class constructor

The constructor and section ordering of the constructor both seem to match now.
This commit is contained in:
LagoLunatic
2025-04-01 16:03:06 -04:00
parent 5dff645173
commit bc4c7dd5f9
6 changed files with 336 additions and 329 deletions
-11
View File
@@ -25,17 +25,6 @@ public:
STATIC_ASSERT(sizeof(daPy_mtxFollowEcallBack_c) == 0x0C);
// TODO: this probably does not belong in d_a_player.h based on the .text section splitting in d_a_player_main
class daPy_HIO_c {
public:
// TODO: constructor should be weak, but not inlined?
// daPy_HIO_c() {}
daPy_HIO_c();
public:
/* 0x00 */ u8 temp[0x3F - 0x00];
}; // Size: 0x3F
class daPy_demo_c {
public:
enum {
+8
View File
@@ -326,6 +326,14 @@ public:
/* 0x02 */ u16 mUpperBckIdx;
};
class daPy_HIO_c {
public:
daPy_HIO_c();
public:
/* 0x00 */ u8 temp[0x3F - 0x00];
}; // Size: 0x3F
class daPy_lk_c : public daPy_py_c {
public:
enum daPy_PROC {
+2
View File
@@ -31,12 +31,14 @@
#define SECTION_DATA __declspec(section ".data")
#define SECTION_INIT __declspec(section ".init")
#define ASM asm
#define WEAKFUNC __declspec(weak)
#else
#define STATIC_ASSERT(...)
#define ALIGN_DECL(...)
#define SECTION_DATA
#define SECTION_INIT
#define ASM
#define WEAKFUNC
#endif
extern int __cntlzw(uint);
+6 -316
View File
@@ -1,328 +1,18 @@
/**
* d_a_player_HIO.inc
*
* Parameters for Link's various actions.
* Player HostIO interface handling.
*
* This file is not a standalone translation unit and is instead directly
* included into d_a_player_main.cpp.
*
* The original name of this file is not known, but a best guess was taken
* based on the original names of the classes it contains.
*
* In the retail version of the game, only a single constructor is present.
* But the debug version had implementations for all of Link's HIO classes.
*/
#include "d/actor/d_a_player_HIO.h"
#include "d/actor/d_a_player_main.h"
const daPy_HIO_basic_c1 daPy_HIO_basic_c0::m = {
1, 160, 1.0f, 50.0f, 2.4f, 700.0f, 0.6f, 5.0f, 0.75f,
};
const daPy_HIO_move_c1 daPy_HIO_move_c0::m = {
3000, 250, 100, 5, 200, 100, 4, 6, 12, 3.5f, 17.0f, 2.5f, 1.8f,
0.6f, 0.5f, 0.5f, 1.0f, 0.8f, 1.1f, 0.4f, 0.8f, 1.2f, 2.3f, 0.95f, 1.6f, 0.35f,
6.0f, 0.5f, 1.0f, 0.87f, 0.6f, 0.0f, 6.0f, 0.8f, 0.85f, 0.7f, 0.5f, 1.3f,
};
const daPy_HIO_atnMove_c1 daPy_HIO_atnMove_c0::m = {
3000, 2000, 6, 5.0f, 12.0f, 7.5f, 4.0f, 0.5f, 0.01f, 0.9f, 1.25f, 1.0f, 1.8f,
};
const daPy_HIO_atnMoveB_c1 daPy_HIO_atnMoveB_c0::m = {
3000, 2000, 6, 2.5f, 15.0f, 8.0f, 2.0f, 0.5f, 0.75f, 1.0f, 0.8f, 0.95f, 0.99f, -0.99f,
};
const daPy_HIO_turn_c1 daPy_HIO_turn_c0::m = {
0x3CDF, 0x1F40, 30, 4, 4096, 512, 28, 62, 62, 0.7f,
5.0f, 1.0f, 0.0f, 5.0f, 1.1f, 0.0f, 2.0f, 1.0f, 0.0f, 5.0f,
};
const daPy_HIO_cutA_c1 daPy_HIO_cutA_c0::m = {
2, 19, 1.2f, 4.0f, 16.0f, 0.2f, 10.0f, 2.6f, 0.5f, 0.7f, 2.5f, 6.0f, 5.0f, 11.0f,
};
const daPy_HIO_cutF_c1 daPy_HIO_cutF_c0::m = {
2, 19, 1.2f, 4.0f, 17.0f, 0.2f, 8.0f, 0.95f, 0.5f, 0.7f, 2.5f, 6.0f, 5.0f, 12.0f,
};
const daPy_HIO_cutR_c1 daPy_HIO_cutR_c0::m = {
2, 19, 1.2f, 4.0f, 16.0f, 0.2f, 1.0f, 0.95f, 0.5f, 0.7f, 2.5f, 6.0f, 6.0f, 12.0f,
};
const daPy_HIO_cutL_c1 daPy_HIO_cutL_c0::m = {
2, 18, 1.2f, 4.0f, 16.0f, 0.2f, 1.0f, 0.95f, 0.5f, 0.7f, 2.5f, 6.0f, 5.0f, 10.0f,
};
const daPy_HIO_cutEA_c1 daPy_HIO_cutEA_c0::m = {
19, 0, 1.0f, 4.0f, 0.2f, 15.0f, 4.0f, 0.5f, 0.7f, 2.0f, 6.0f, 5.0f, 11.0f,
};
const daPy_HIO_cutEB_c1 daPy_HIO_cutEB_c0::m = {
19, 0, 0.9f, 4.0f, 0.2f, 7.0f, 1.5f, 0.5f, 0.7f, 2.0f, 6.0f, 5.0f, 11.0f,
};
const daPy_HIO_cutExA_c1 daPy_HIO_cutExA_c0::m = {
21, 0, 1, 1.1f, 4.0f, 1.0f, 12.0f, 18.0f, 18.0f,
};
const daPy_HIO_cutExB_c1 daPy_HIO_cutExB_c0::m = {
36, 0, 0.9f, 5.0f, 5.0f, 14.0f, 20.0f,
};
const daPy_HIO_cutExMJ_c1 daPy_HIO_cutExMJ_c0::m = {
6, 2, 0.9f, 0.0f, 1.0f, 29.0f, -5.0f, -1.7f, 30.0f, 3.0f, 1.0f,
};
const daPy_HIO_cutKesa_c1 daPy_HIO_cutKesa_c0::m = {
49, 2, 1.3f, 4.0f, 1.0f, 22.0f, 26.0f, 32.0f,
};
const daPy_HIO_cutTurn_c1 daPy_HIO_cutTurn_c0::m = {
21, 1, 1.2f, 2.0f, 5.0f, 21.0f, 0.8f, 0.0f, 5.0f, 0.5f, 0.7f,
3.0f, 0.0f, 3.0f, 18.5f, 1.0f, 1.5f, 180.0f, 230.0f, 1.0f, 1.3f, 1.5f,
1.7f, 2.2f, 1.5f, 180.0f, 200.0f, 250.0f, 270.0f, 360.0f, 250.0f,
};
const daPy_HIO_cutTurnR_c1 daPy_HIO_cutTurnR_c0::m = {
0, 4, 9, 27379, 1748, 0.8f, 1.0f, 3.0f, 0.8f, 3.0f, 0.8f, 3.0f, 0.95f,
};
const daPy_HIO_cutRoll_c1 daPy_HIO_cutRoll_c0::m = {
6, 90, 14000, 60, 1.2f, 4.0f, 1.0f, 30.0f, 1.0f, 1.5f, 180.0f, 230.0f,
};
const daPy_HIO_cutJump_c1 daPy_HIO_cutJump_c0::m = {
15, 14, 2, 15, 0.74f, 2.0f, 1.0f, 18.0f, 27.0f, -3.0f, 0.8f,
1.0f, 5.0f, 9.0f, 18.0f, -3.0f, 1.1f, 1.0f, 2.0f, 12.0f, 13.0f, 15.0f,
};
const daPy_HIO_cutBoko_c1 daPy_HIO_cutBoko_c0::m = {
0.0f, 0, 34, 42, 13, 11, 8, 1.1f, 0.9f, 1.0f, 27.0f, 0.4f,
11.0f, 2.6f, 0.5f, 0.8f, 3.0f, 8.0f, 6.0f, 7.0f, 13.0f, 0.9f, 20.0f, 69.0f,
6.0f, 25.0f, 32.0f, 0.7f, 3.0f, 3.0f, 0.8f, 0.0f, 0.6f, 5.0f, 8.0f, 10.0f,
};
const daPy_HIO_cut_c1 daPy_HIO_cut_c0::m = {
14, 15, 12, 18, -1.8f, 1.0f, 1.0f, 0.8f, 0.0f, 3.0f, 1.1f, 0.0f, 6.0f, 0.5f, 2.0f,
11.0f, 0.0f, 20.0f, 1.5f, 30.0f, 2.5f, 20.0f, 1.7f, 30.0f, 2.0f, 50.0f, 1.7f, 50.0f, 2.0f,
};
const daPy_HIO_roll_c1 daPy_HIO_roll_c0::m = {
19, 24, 5000, 1.1f, 0.0f, 17.0f, 2.0f, 1.5f, 0.5f, 5.0f,
0.7f, 6.0f, 1.0f, 20.0f, 6.0f, 15.0f, 10.0f, 0.4f, 7.0f,
};
const daPy_HIO_backJump_c1 daPy_HIO_backJump_c0::m = {
11, 5, 0.8f, 2.0f, 0.0f, 22.5f, 19.0f, -3.0f, 30.0f, 10.0f, 0.8f, 0.0f, 0.0f, 2.0f,
};
const daPy_HIO_slip_c1 daPy_HIO_slip_c0::m = {
0.0f, 0.6f, 1.1f, 0.4f, 1.25f, 0.1875f, 0.6f, 1.7f, 2.5f,
};
const daPy_HIO_slide_c1 daPy_HIO_slide_c0::m = {
9, 9, 9, 8, 14336, 0.3f, 2.0f, 5.0f, 0.3f, 0.0f, 5.0f,
0.8f, 2.0f, 6.0f, 5.0f, 1.0f, 2.0f, 6.0f, 5.0f, 30.0f, 3.0f,
};
const daPy_HIO_autoJump_c1 daPy_HIO_autoJump_c0::m = {
0, 5, 11, 11000, 100, -2.5f, -175.0f, 9.0f, 1.6f, 0.4f,
0.8f, 1.3f, 3.0f, 1.0f, 1.0f, 0.0f, 20.0f, 0.8f, 7.0f,
};
const daPy_HIO_fall_c1 daPy_HIO_fall_c0::m = {
13, 30, 9, 9, 22, 50, 3, 60.0f, 20.0f, 1.0f, 0.8f, 4.0f,
0.0f, 0.3f, 1.0f, 9.0f, 5.0f, 6.0f, 1.3f, 6.0f, 19.0f, 6.0f, 26.0f, 1.2f,
};
const daPy_HIO_swim_c1 daPy_HIO_swim_c0::m = {
24, 2330, 5000, 1200, 17, 18.0f, 1.0f, -50.0f, 0.02f, 2.0f, 0.5f, 90.0f,
15.0f, 0.7f, 0.0f, 19.0f, 3.0f, 0.0f, 0.5f, 18.0f, 1.0f, 5.0f, 0.6f, 1.1f,
5.3f, 0.0f, 0.4f, 6.0f, 9.5f, 37.5f, 2.5f, 1.0f, 30.0f, 0.35f,
};
const daPy_HIO_b_jump_c1 daPy_HIO_b_jump_c0::m = {
1, 0, 0, 8, 3500, 1.0f, 2.0f, 1.0f, 4.0f, 0.0f, 5.0f, -5.0f,
-3.75f, 0.6f, 0.0f, 1.0f, 32.5f, 12.5f, -3.75f, 10.0f, 2.5f, 6.5f,
};
const daPy_HIO_b_roll_c1 daPy_HIO_b_roll_c0::m = {
1700, 30, 5, 22, 6, 6144, 0.8f, 4.0f, 5.0f,
17.0f, 0.5f, 3.0f, 0.0f, 20.0f, 40.0f, -4.0f, -3.5f, 15.0f,
};
const daPy_HIO_b_slide_c1 daPy_HIO_b_slide_c0::m = {
42.5f,
0.5f,
6.25f,
2.5f,
};
const daPy_HIO_b_verJump_c1 daPy_HIO_b_verJump_c0::m = {
5, 19, 17, 0.2f, 2.0f, 6.0f, -9.0f, 70.0f, 1.5f,
4.0f, 8.0f, -7.0f, -10.0f, 1.0f, 2.0f, 0.0f, 5.5f, 25.0f,
};
const daPy_HIO_wall_c1 daPy_HIO_wall_c0::m = {
10, 7, 14, 14, 28, 28, 1.3f, 1.1f, 1.6f, 1.8f, 0.8f, 0.9f, 3.0f, 0.0f, 1.0f,
1.0f, 5.0f, 5.0f, 5.0f, 5.0f, 5.0f, 5.0f, 5.0f, 8.5f, 25.0f, 0.9f, 0.9f, 1.0f, 0.98f,
};
const daPy_HIO_smallJump_c1 daPy_HIO_smallJump_c0::m = {
6, 4, 0.2f, 0.0f, 0.0f, 5.0f, 45.0f, 7.0f,
};
const daPy_HIO_wallCatch_c1 daPy_HIO_wallCatch_c0::m = {
5, 7, 24, 13, 7, 75.0f, 110.0f, 130.0f, 170.0f, 0.8f, 2.5f, 0.75f,
5.0f, 0.0f, 2.0f, 0.0f, 23.0f, 1.0f, 1.0f, 0.8f, 2.0f, 1.0f, 6.0f, 6.0f,
};
const daPy_HIO_hang_c1 daPy_HIO_hang_c0::m = {
21, 13, 0.8f, 2.0f, 10.0f, 2.0f, 0.7f, 1.0f, 13.0f, 8.0f, 0.7f, 1.4f, 1.0f, 1.0f,
};
const daPy_HIO_guard_c1 daPy_HIO_guard_c0::m = {
11, 0.85f, 0.0f, 2.0f, 7.5f, 0.02f, 0.5f, 1.125f, 0.3f, 12.5f,
};
const daPy_HIO_nockback_c1 daPy_HIO_nockback_c0::m = {
11, 0, 24, 0.9f, 0.0f, 2.0f, 52.0f, 0.02f, 0.5f, 4.9f, 3.0f, 12.5f, 0.8f, 8.0f, 3.0f, 16.0f,
};
const daPy_HIO_iceSlip_c1 daPy_HIO_iceSlip_c0::m = {
29, 8000, 36, 36, 36, 36, 9, 0.9f, 0.0f, 2.0f, 12.0f,
3.0f, 0.7f, 3.0f, 30.0f, 3.0f, 0.8f, 3.0f, 33.0f, 2.0f, 0.7f, 7.0f,
30.0f, 0.0f, 0.7f, 7.0f, 30.0f, 0.0f, 0.6f, 1.0f, 6.0f, 1.0f,
};
const daPy_HIO_damage_c1 daPy_HIO_damage_c0::m = {
9, 8000, 9, 0.0f, 13.0f, 0.05f, 0.6f, 0.0f, 0.5f, 1.2f, 0.25f, 1.5f, 12.0f, 0.6f, 0.0f, 1.0f,
};
const daPy_HIO_laDamage_c1 daPy_HIO_laDamage_c0::m = {
0, 1300, 36, 36, 36, 36, 19, 2, 2, 2, 0.0f,
25.0f, -13.0f, 60.0f, 0.7f, 0.0f, 30.0f, 2.0f, 0.8f, 0.0f, 30.0f, 2.0f,
0.7f, 1.0f, 30.0f, 2.0f, 0.7f, 1.0f, 30.0f, 2.0f, 16.0f, 1.5f, 18.0f,
1.0f, 1.2f, 0.0f, 1.0f, 1.3f, 0.0f, 1.0f, 1.3f, 0.0f, 1.0f,
};
const daPy_HIO_huDamage_c1 daPy_HIO_huDamage_c0::m = {
0, 2000, 36, 36, 36, 36, 19, 2, 2, 2, 0.0f,
80.0f, -9.0f, 50.0f, 0.6f, 0.0f, 34.0f, 2.0f, 0.6f, 0.0f, 34.0f, 2.0f,
0.6f, 1.0f, 34.0f, 2.0f, 0.6f, 1.0f, 34.0f, 2.0f, 16.0f, 1.5f, 18.0f,
1.0f, 1.2f, 0.0f, 1.0f, 1.3f, 0.0f, 1.0f, 1.3f, 0.0f, 1.0f,
};
const daPy_HIO_elecDamage_c1 daPy_HIO_elecDamage_c0::m = {
20,
75,
1.0f,
0.0f,
};
const daPy_HIO_slowJump_c1 daPy_HIO_slowJump_c0::m = {
19, 40, -2.0f, 16.25f, 10.5f, 0.9f, 0.0f, 15.0f,
5.0f, 2.0f, 0.8f, 0.0f, 5.0f, 25.0f, 100.0f, 6.0f,
};
const daPy_HIO_sideStep_c1 daPy_HIO_sideStep_c0::m = {
256, 6200, 4, 5, 30.0f, 0.3f, 0.0f, 1.0f, -2.4f, 0.85f, 1.0f, 0.0f, 1.5f, 14.0f, 50.0f,
};
const daPy_HIO_grab_c1 daPy_HIO_grab_c0::m = {
4, 9, 6, 12, 4, 14, 7, 19, 5, 5, 0, 40, 300,
40, 12, 0.8f, 0.0f, 1.0f, 0.9f, 0.0f, 9.0f, 1.0f, 1.0f, 0.0f, 1.0f, -0.8f,
0.0f, 0.0f, 4.0f, 0.8f, 1.0f, 7.0f, 0.0f, -1.1f, 0.0f, 0.0f, 0.0f, 1.0f, 3.0f,
1.0f, 19.0f, 34.0f, 2.0f, 1.2f, 1.1f, 3.0f, 6.0f, 2.0f, 0.8f, 0.4f,
};
const daPy_HIO_ladder_c1 daPy_HIO_ladder_c0::m = {
13, 1.0f, 1.0f, 0.9f, 3.0f, 1.3f, 3.0f, 1.0f, 2.0f,
1.2f, 0.5f, 0.0f, 1.0f, 0.8f, 0.0f, 0.0f, 0.8f,
};
const daPy_HIO_crouch_c1 daPy_HIO_crouch_c0::m = {
8500, 2500, 10000, 9, 32, 7000, 500, 8, 0.8f, 2.0f, 0.8f, 5.0f,
1.0f, 0.0f, 7.0f, 3.0f, 3.0f, 1.0f, 5.0f, 3.0f, -1.0f, 0.0f, 3.0f, 2.0f,
};
const daPy_HIO_pushpull_c1 daPy_HIO_pushpull_c0::m = {
1.0f, 5.0f, 1.0f, 5.0f, 1.0f, 5.0f,
};
const daPy_HIO_rope_c1 daPy_HIO_rope_c0::m = {
12000, 12000, 7, 90, 11, 11, 15.0f, 30.0f, 50.0f, 1.0f, 0.0f, 3.0f, 0.5f, 4.0f, 6.0f,
0.8f, 1.5f, 1.5f, 4.0f, 27.0f, 1.3f, 1.0f, 0.0f, 1.0f, 3.0f, 0.8f, 3.0f, 11.0f, 0.0f,
};
const daPy_HIO_boom_c1 daPy_HIO_boom_c0::m = {
10, 11, 1.5f, 2.0f, 3.0f, 10.0f, 7.0f, 0.8f, 5.0f, 1.0f, 1.0f, 0.0f, 11.0f,
};
const daPy_HIO_fan_c1 daPy_HIO_fan_c0::m = {
0, 34, 13, 12, 40, 20, 1.0f, 0.0f, 5.0f, 200.0f, 100.0f, 0.5f, 3.0f,
1.0f, 0.0f, 3.0f, 5.0f, -2.0f, -0.5f, 15.0f, 15.0f, 12.0f, 9.4f, 0.6f, 2.0f, 5.0f,
};
const daPy_HIO_tact_c1 daPy_HIO_tact_c0::m = {
0.8f, 6.0f, 0.08f, 4.0f, 1.0f, 1.0f, 1.0f,
};
const daPy_HIO_ham_c1 daPy_HIO_ham_c0::m = {
60, 28, 35, 12, 1.2f, 4.0f, 55.0f, 2.0f, 25.0f, 36.0f,
1.0f, 2.0f, 3.0f, 1.0f, 0.0f, 0.9f, 5.0f, 10.0f, 0.0f,
};
const daPy_HIO_boots_c1 daPy_HIO_boots_c0::m = {
19, 150, 1.0f, 0.0f, 19.0f, 5.0f,
};
const daPy_HIO_bottle_c1 daPy_HIO_bottle_c0::m = {
16, 16, 50, 45, 69, 124, 81, 36, 1.2f, 0.0f, 15.0f,
0.0f, 1.2f, 0.0f, 15.0f, 0.0f, 1.0f, 0.0f, 4.0f, 0.0f, 2.0f, 0.0f,
5.0f, 15.0f, 0.0f, 5.0f, 0.0f, 0.0f, 5.0f, 0.9f, 0.0f, 2.0f,
};
const daPy_HIO_bow_c1 daPy_HIO_bow_c0::m = {
4, 6, 0.9f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f,
};
const daPy_HIO_food_c1 daPy_HIO_food_c0::m = {
17, 21, 0.6f, 0.0f, 4.0f, 1.1f, 2.0f, 4.0f,
};
const daPy_HIO_item_c1 daPy_HIO_item_c0::m = {
15, 10, 7, 1.0f, 2.0f, 1.0f, 0.7f, 1.0f, 3.0f, 4.0f, 0.8f, 3.0f, 4.0f, 6.0f,
};
const daPy_HIO_ship_c1 daPy_HIO_ship_c0::m = {
14336, 2000, 5325, 1.0f, 0.2f, 8.0f, 8.0f,
};
const daPy_HIO_restart_c1 daPy_HIO_restart_c0::m = {
1.0f, 5.0f, 80.0f, 1.0f, 0.0f, 2.0f,
};
const daPy_HIO_holdup_c1 daPy_HIO_holdup_c0::m = {
72, 11, 60, 60, 89, 44, 1.0f, 0.0f, 1.0f, 1.1f, 0.0f, 5.0f, 1.0f,
0.0f, 5.0f, 1.0f, 0.0f, 5.0f, 1.5f, 2.0f, 10.0f, 10.0f, 1.0f, 0.0f, 5.0f,
};
const daPy_HIO_vomit_c1 daPy_HIO_vomit_c0::m = {
6, 22000, 9, 7, 9, 0.3f, 1.0f, 10.0f, 28.0f,
64.5f, 12.725f, 1.0f, 4.0f, 0.0f, 0.5f, 1.0f, 8.0f, 8.0f,
};
const daPy_HIO_warp_c1 daPy_HIO_warp_c0::m = {
53, 12, 28, 4, 1.2f, 1.6f, 0.5f, 0.1f, 1.35f,
};
const daPy_HIO_battle_c1 daPy_HIO_battle_c0::m = {
0.0f, 1.5f,
};
const daPy_HIO_dam_c1 daPy_HIO_dam_c0::m = {
30, 20,
};
const daPy_HIO_magicShield_c1 daPy_HIO_magicShield_c0::m = {
60, 0,
};
daPy_HIO_c::daPy_HIO_c() {}
+317
View File
@@ -0,0 +1,317 @@
#include "d/actor/d_a_player_HIO.h"
const daPy_HIO_basic_c1 daPy_HIO_basic_c0::m = {
1, 160, 1.0f, 50.0f, 2.4f, 700.0f, 0.6f, 5.0f, 0.75f,
};
const daPy_HIO_move_c1 daPy_HIO_move_c0::m = {
3000, 250, 100, 5, 200, 100, 4, 6, 12, 3.5f, 17.0f, 2.5f, 1.8f,
0.6f, 0.5f, 0.5f, 1.0f, 0.8f, 1.1f, 0.4f, 0.8f, 1.2f, 2.3f, 0.95f, 1.6f, 0.35f,
6.0f, 0.5f, 1.0f, 0.87f, 0.6f, 0.0f, 6.0f, 0.8f, 0.85f, 0.7f, 0.5f, 1.3f,
};
const daPy_HIO_atnMove_c1 daPy_HIO_atnMove_c0::m = {
3000, 2000, 6, 5.0f, 12.0f, 7.5f, 4.0f, 0.5f, 0.01f, 0.9f, 1.25f, 1.0f, 1.8f,
};
const daPy_HIO_atnMoveB_c1 daPy_HIO_atnMoveB_c0::m = {
3000, 2000, 6, 2.5f, 15.0f, 8.0f, 2.0f, 0.5f, 0.75f, 1.0f, 0.8f, 0.95f, 0.99f, -0.99f,
};
const daPy_HIO_turn_c1 daPy_HIO_turn_c0::m = {
0x3CDF, 0x1F40, 30, 4, 4096, 512, 28, 62, 62, 0.7f,
5.0f, 1.0f, 0.0f, 5.0f, 1.1f, 0.0f, 2.0f, 1.0f, 0.0f, 5.0f,
};
const daPy_HIO_cutA_c1 daPy_HIO_cutA_c0::m = {
2, 19, 1.2f, 4.0f, 16.0f, 0.2f, 10.0f, 2.6f, 0.5f, 0.7f, 2.5f, 6.0f, 5.0f, 11.0f,
};
const daPy_HIO_cutF_c1 daPy_HIO_cutF_c0::m = {
2, 19, 1.2f, 4.0f, 17.0f, 0.2f, 8.0f, 0.95f, 0.5f, 0.7f, 2.5f, 6.0f, 5.0f, 12.0f,
};
const daPy_HIO_cutR_c1 daPy_HIO_cutR_c0::m = {
2, 19, 1.2f, 4.0f, 16.0f, 0.2f, 1.0f, 0.95f, 0.5f, 0.7f, 2.5f, 6.0f, 6.0f, 12.0f,
};
const daPy_HIO_cutL_c1 daPy_HIO_cutL_c0::m = {
2, 18, 1.2f, 4.0f, 16.0f, 0.2f, 1.0f, 0.95f, 0.5f, 0.7f, 2.5f, 6.0f, 5.0f, 10.0f,
};
const daPy_HIO_cutEA_c1 daPy_HIO_cutEA_c0::m = {
19, 0, 1.0f, 4.0f, 0.2f, 15.0f, 4.0f, 0.5f, 0.7f, 2.0f, 6.0f, 5.0f, 11.0f,
};
const daPy_HIO_cutEB_c1 daPy_HIO_cutEB_c0::m = {
19, 0, 0.9f, 4.0f, 0.2f, 7.0f, 1.5f, 0.5f, 0.7f, 2.0f, 6.0f, 5.0f, 11.0f,
};
const daPy_HIO_cutExA_c1 daPy_HIO_cutExA_c0::m = {
21, 0, 1, 1.1f, 4.0f, 1.0f, 12.0f, 18.0f, 18.0f,
};
const daPy_HIO_cutExB_c1 daPy_HIO_cutExB_c0::m = {
36, 0, 0.9f, 5.0f, 5.0f, 14.0f, 20.0f,
};
const daPy_HIO_cutExMJ_c1 daPy_HIO_cutExMJ_c0::m = {
6, 2, 0.9f, 0.0f, 1.0f, 29.0f, -5.0f, -1.7f, 30.0f, 3.0f, 1.0f,
};
const daPy_HIO_cutKesa_c1 daPy_HIO_cutKesa_c0::m = {
49, 2, 1.3f, 4.0f, 1.0f, 22.0f, 26.0f, 32.0f,
};
const daPy_HIO_cutTurn_c1 daPy_HIO_cutTurn_c0::m = {
21, 1, 1.2f, 2.0f, 5.0f, 21.0f, 0.8f, 0.0f, 5.0f, 0.5f, 0.7f,
3.0f, 0.0f, 3.0f, 18.5f, 1.0f, 1.5f, 180.0f, 230.0f, 1.0f, 1.3f, 1.5f,
1.7f, 2.2f, 1.5f, 180.0f, 200.0f, 250.0f, 270.0f, 360.0f, 250.0f,
};
const daPy_HIO_cutTurnR_c1 daPy_HIO_cutTurnR_c0::m = {
0, 4, 9, 27379, 1748, 0.8f, 1.0f, 3.0f, 0.8f, 3.0f, 0.8f, 3.0f, 0.95f,
};
const daPy_HIO_cutRoll_c1 daPy_HIO_cutRoll_c0::m = {
6, 90, 14000, 60, 1.2f, 4.0f, 1.0f, 30.0f, 1.0f, 1.5f, 180.0f, 230.0f,
};
const daPy_HIO_cutJump_c1 daPy_HIO_cutJump_c0::m = {
15, 14, 2, 15, 0.74f, 2.0f, 1.0f, 18.0f, 27.0f, -3.0f, 0.8f,
1.0f, 5.0f, 9.0f, 18.0f, -3.0f, 1.1f, 1.0f, 2.0f, 12.0f, 13.0f, 15.0f,
};
const daPy_HIO_cutBoko_c1 daPy_HIO_cutBoko_c0::m = {
0.0f, 0, 34, 42, 13, 11, 8, 1.1f, 0.9f, 1.0f, 27.0f, 0.4f,
11.0f, 2.6f, 0.5f, 0.8f, 3.0f, 8.0f, 6.0f, 7.0f, 13.0f, 0.9f, 20.0f, 69.0f,
6.0f, 25.0f, 32.0f, 0.7f, 3.0f, 3.0f, 0.8f, 0.0f, 0.6f, 5.0f, 8.0f, 10.0f,
};
const daPy_HIO_cut_c1 daPy_HIO_cut_c0::m = {
14, 15, 12, 18, -1.8f, 1.0f, 1.0f, 0.8f, 0.0f, 3.0f, 1.1f, 0.0f, 6.0f, 0.5f, 2.0f,
11.0f, 0.0f, 20.0f, 1.5f, 30.0f, 2.5f, 20.0f, 1.7f, 30.0f, 2.0f, 50.0f, 1.7f, 50.0f, 2.0f,
};
const daPy_HIO_roll_c1 daPy_HIO_roll_c0::m = {
19, 24, 5000, 1.1f, 0.0f, 17.0f, 2.0f, 1.5f, 0.5f, 5.0f,
0.7f, 6.0f, 1.0f, 20.0f, 6.0f, 15.0f, 10.0f, 0.4f, 7.0f,
};
const daPy_HIO_backJump_c1 daPy_HIO_backJump_c0::m = {
11, 5, 0.8f, 2.0f, 0.0f, 22.5f, 19.0f, -3.0f, 30.0f, 10.0f, 0.8f, 0.0f, 0.0f, 2.0f,
};
const daPy_HIO_slip_c1 daPy_HIO_slip_c0::m = {
0.0f, 0.6f, 1.1f, 0.4f, 1.25f, 0.1875f, 0.6f, 1.7f, 2.5f,
};
const daPy_HIO_slide_c1 daPy_HIO_slide_c0::m = {
9, 9, 9, 8, 14336, 0.3f, 2.0f, 5.0f, 0.3f, 0.0f, 5.0f,
0.8f, 2.0f, 6.0f, 5.0f, 1.0f, 2.0f, 6.0f, 5.0f, 30.0f, 3.0f,
};
const daPy_HIO_autoJump_c1 daPy_HIO_autoJump_c0::m = {
0, 5, 11, 11000, 100, -2.5f, -175.0f, 9.0f, 1.6f, 0.4f,
0.8f, 1.3f, 3.0f, 1.0f, 1.0f, 0.0f, 20.0f, 0.8f, 7.0f,
};
const daPy_HIO_fall_c1 daPy_HIO_fall_c0::m = {
13, 30, 9, 9, 22, 50, 3, 60.0f, 20.0f, 1.0f, 0.8f, 4.0f,
0.0f, 0.3f, 1.0f, 9.0f, 5.0f, 6.0f, 1.3f, 6.0f, 19.0f, 6.0f, 26.0f, 1.2f,
};
const daPy_HIO_swim_c1 daPy_HIO_swim_c0::m = {
24, 2330, 5000, 1200, 17, 18.0f, 1.0f, -50.0f, 0.02f, 2.0f, 0.5f, 90.0f,
15.0f, 0.7f, 0.0f, 19.0f, 3.0f, 0.0f, 0.5f, 18.0f, 1.0f, 5.0f, 0.6f, 1.1f,
5.3f, 0.0f, 0.4f, 6.0f, 9.5f, 37.5f, 2.5f, 1.0f, 30.0f, 0.35f,
};
const daPy_HIO_b_jump_c1 daPy_HIO_b_jump_c0::m = {
1, 0, 0, 8, 3500, 1.0f, 2.0f, 1.0f, 4.0f, 0.0f, 5.0f, -5.0f,
-3.75f, 0.6f, 0.0f, 1.0f, 32.5f, 12.5f, -3.75f, 10.0f, 2.5f, 6.5f,
};
const daPy_HIO_b_roll_c1 daPy_HIO_b_roll_c0::m = {
1700, 30, 5, 22, 6, 6144, 0.8f, 4.0f, 5.0f,
17.0f, 0.5f, 3.0f, 0.0f, 20.0f, 40.0f, -4.0f, -3.5f, 15.0f,
};
const daPy_HIO_b_slide_c1 daPy_HIO_b_slide_c0::m = {
42.5f,
0.5f,
6.25f,
2.5f,
};
const daPy_HIO_b_verJump_c1 daPy_HIO_b_verJump_c0::m = {
5, 19, 17, 0.2f, 2.0f, 6.0f, -9.0f, 70.0f, 1.5f,
4.0f, 8.0f, -7.0f, -10.0f, 1.0f, 2.0f, 0.0f, 5.5f, 25.0f,
};
const daPy_HIO_wall_c1 daPy_HIO_wall_c0::m = {
10, 7, 14, 14, 28, 28, 1.3f, 1.1f, 1.6f, 1.8f, 0.8f, 0.9f, 3.0f, 0.0f, 1.0f,
1.0f, 5.0f, 5.0f, 5.0f, 5.0f, 5.0f, 5.0f, 5.0f, 8.5f, 25.0f, 0.9f, 0.9f, 1.0f, 0.98f,
};
const daPy_HIO_smallJump_c1 daPy_HIO_smallJump_c0::m = {
6, 4, 0.2f, 0.0f, 0.0f, 5.0f, 45.0f, 7.0f,
};
const daPy_HIO_wallCatch_c1 daPy_HIO_wallCatch_c0::m = {
5, 7, 24, 13, 7, 75.0f, 110.0f, 130.0f, 170.0f, 0.8f, 2.5f, 0.75f,
5.0f, 0.0f, 2.0f, 0.0f, 23.0f, 1.0f, 1.0f, 0.8f, 2.0f, 1.0f, 6.0f, 6.0f,
};
const daPy_HIO_hang_c1 daPy_HIO_hang_c0::m = {
21, 13, 0.8f, 2.0f, 10.0f, 2.0f, 0.7f, 1.0f, 13.0f, 8.0f, 0.7f, 1.4f, 1.0f, 1.0f,
};
const daPy_HIO_guard_c1 daPy_HIO_guard_c0::m = {
11, 0.85f, 0.0f, 2.0f, 7.5f, 0.02f, 0.5f, 1.125f, 0.3f, 12.5f,
};
const daPy_HIO_nockback_c1 daPy_HIO_nockback_c0::m = {
11, 0, 24, 0.9f, 0.0f, 2.0f, 52.0f, 0.02f, 0.5f, 4.9f, 3.0f, 12.5f, 0.8f, 8.0f, 3.0f, 16.0f,
};
const daPy_HIO_iceSlip_c1 daPy_HIO_iceSlip_c0::m = {
29, 8000, 36, 36, 36, 36, 9, 0.9f, 0.0f, 2.0f, 12.0f,
3.0f, 0.7f, 3.0f, 30.0f, 3.0f, 0.8f, 3.0f, 33.0f, 2.0f, 0.7f, 7.0f,
30.0f, 0.0f, 0.7f, 7.0f, 30.0f, 0.0f, 0.6f, 1.0f, 6.0f, 1.0f,
};
const daPy_HIO_damage_c1 daPy_HIO_damage_c0::m = {
9, 8000, 9, 0.0f, 13.0f, 0.05f, 0.6f, 0.0f, 0.5f, 1.2f, 0.25f, 1.5f, 12.0f, 0.6f, 0.0f, 1.0f,
};
const daPy_HIO_laDamage_c1 daPy_HIO_laDamage_c0::m = {
0, 1300, 36, 36, 36, 36, 19, 2, 2, 2, 0.0f,
25.0f, -13.0f, 60.0f, 0.7f, 0.0f, 30.0f, 2.0f, 0.8f, 0.0f, 30.0f, 2.0f,
0.7f, 1.0f, 30.0f, 2.0f, 0.7f, 1.0f, 30.0f, 2.0f, 16.0f, 1.5f, 18.0f,
1.0f, 1.2f, 0.0f, 1.0f, 1.3f, 0.0f, 1.0f, 1.3f, 0.0f, 1.0f,
};
const daPy_HIO_huDamage_c1 daPy_HIO_huDamage_c0::m = {
0, 2000, 36, 36, 36, 36, 19, 2, 2, 2, 0.0f,
80.0f, -9.0f, 50.0f, 0.6f, 0.0f, 34.0f, 2.0f, 0.6f, 0.0f, 34.0f, 2.0f,
0.6f, 1.0f, 34.0f, 2.0f, 0.6f, 1.0f, 34.0f, 2.0f, 16.0f, 1.5f, 18.0f,
1.0f, 1.2f, 0.0f, 1.0f, 1.3f, 0.0f, 1.0f, 1.3f, 0.0f, 1.0f,
};
const daPy_HIO_elecDamage_c1 daPy_HIO_elecDamage_c0::m = {
20,
75,
1.0f,
0.0f,
};
const daPy_HIO_slowJump_c1 daPy_HIO_slowJump_c0::m = {
19, 40, -2.0f, 16.25f, 10.5f, 0.9f, 0.0f, 15.0f,
5.0f, 2.0f, 0.8f, 0.0f, 5.0f, 25.0f, 100.0f, 6.0f,
};
const daPy_HIO_sideStep_c1 daPy_HIO_sideStep_c0::m = {
256, 6200, 4, 5, 30.0f, 0.3f, 0.0f, 1.0f, -2.4f, 0.85f, 1.0f, 0.0f, 1.5f, 14.0f, 50.0f,
};
const daPy_HIO_grab_c1 daPy_HIO_grab_c0::m = {
4, 9, 6, 12, 4, 14, 7, 19, 5, 5, 0, 40, 300,
40, 12, 0.8f, 0.0f, 1.0f, 0.9f, 0.0f, 9.0f, 1.0f, 1.0f, 0.0f, 1.0f, -0.8f,
0.0f, 0.0f, 4.0f, 0.8f, 1.0f, 7.0f, 0.0f, -1.1f, 0.0f, 0.0f, 0.0f, 1.0f, 3.0f,
1.0f, 19.0f, 34.0f, 2.0f, 1.2f, 1.1f, 3.0f, 6.0f, 2.0f, 0.8f, 0.4f,
};
const daPy_HIO_ladder_c1 daPy_HIO_ladder_c0::m = {
13, 1.0f, 1.0f, 0.9f, 3.0f, 1.3f, 3.0f, 1.0f, 2.0f,
1.2f, 0.5f, 0.0f, 1.0f, 0.8f, 0.0f, 0.0f, 0.8f,
};
const daPy_HIO_crouch_c1 daPy_HIO_crouch_c0::m = {
8500, 2500, 10000, 9, 32, 7000, 500, 8, 0.8f, 2.0f, 0.8f, 5.0f,
1.0f, 0.0f, 7.0f, 3.0f, 3.0f, 1.0f, 5.0f, 3.0f, -1.0f, 0.0f, 3.0f, 2.0f,
};
const daPy_HIO_pushpull_c1 daPy_HIO_pushpull_c0::m = {
1.0f, 5.0f, 1.0f, 5.0f, 1.0f, 5.0f,
};
const daPy_HIO_rope_c1 daPy_HIO_rope_c0::m = {
12000, 12000, 7, 90, 11, 11, 15.0f, 30.0f, 50.0f, 1.0f, 0.0f, 3.0f, 0.5f, 4.0f, 6.0f,
0.8f, 1.5f, 1.5f, 4.0f, 27.0f, 1.3f, 1.0f, 0.0f, 1.0f, 3.0f, 0.8f, 3.0f, 11.0f, 0.0f,
};
const daPy_HIO_boom_c1 daPy_HIO_boom_c0::m = {
10, 11, 1.5f, 2.0f, 3.0f, 10.0f, 7.0f, 0.8f, 5.0f, 1.0f, 1.0f, 0.0f, 11.0f,
};
const daPy_HIO_fan_c1 daPy_HIO_fan_c0::m = {
0, 34, 13, 12, 40, 20, 1.0f, 0.0f, 5.0f, 200.0f, 100.0f, 0.5f, 3.0f,
1.0f, 0.0f, 3.0f, 5.0f, -2.0f, -0.5f, 15.0f, 15.0f, 12.0f, 9.4f, 0.6f, 2.0f, 5.0f,
};
const daPy_HIO_tact_c1 daPy_HIO_tact_c0::m = {
0.8f, 6.0f, 0.08f, 4.0f, 1.0f, 1.0f, 1.0f,
};
const daPy_HIO_ham_c1 daPy_HIO_ham_c0::m = {
60, 28, 35, 12, 1.2f, 4.0f, 55.0f, 2.0f, 25.0f, 36.0f,
1.0f, 2.0f, 3.0f, 1.0f, 0.0f, 0.9f, 5.0f, 10.0f, 0.0f,
};
const daPy_HIO_boots_c1 daPy_HIO_boots_c0::m = {
19, 150, 1.0f, 0.0f, 19.0f, 5.0f,
};
const daPy_HIO_bottle_c1 daPy_HIO_bottle_c0::m = {
16, 16, 50, 45, 69, 124, 81, 36, 1.2f, 0.0f, 15.0f,
0.0f, 1.2f, 0.0f, 15.0f, 0.0f, 1.0f, 0.0f, 4.0f, 0.0f, 2.0f, 0.0f,
5.0f, 15.0f, 0.0f, 5.0f, 0.0f, 0.0f, 5.0f, 0.9f, 0.0f, 2.0f,
};
const daPy_HIO_bow_c1 daPy_HIO_bow_c0::m = {
4, 6, 0.9f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f,
};
const daPy_HIO_food_c1 daPy_HIO_food_c0::m = {
17, 21, 0.6f, 0.0f, 4.0f, 1.1f, 2.0f, 4.0f,
};
const daPy_HIO_item_c1 daPy_HIO_item_c0::m = {
15, 10, 7, 1.0f, 2.0f, 1.0f, 0.7f, 1.0f, 3.0f, 4.0f, 0.8f, 3.0f, 4.0f, 6.0f,
};
const daPy_HIO_ship_c1 daPy_HIO_ship_c0::m = {
14336, 2000, 5325, 1.0f, 0.2f, 8.0f, 8.0f,
};
const daPy_HIO_restart_c1 daPy_HIO_restart_c0::m = {
1.0f, 5.0f, 80.0f, 1.0f, 0.0f, 2.0f,
};
const daPy_HIO_holdup_c1 daPy_HIO_holdup_c0::m = {
72, 11, 60, 60, 89, 44, 1.0f, 0.0f, 1.0f, 1.1f, 0.0f, 5.0f, 1.0f,
0.0f, 5.0f, 1.0f, 0.0f, 5.0f, 1.5f, 2.0f, 10.0f, 10.0f, 1.0f, 0.0f, 5.0f,
};
const daPy_HIO_vomit_c1 daPy_HIO_vomit_c0::m = {
6, 22000, 9, 7, 9, 0.3f, 1.0f, 10.0f, 28.0f,
64.5f, 12.725f, 1.0f, 4.0f, 0.0f, 0.5f, 1.0f, 8.0f, 8.0f,
};
const daPy_HIO_warp_c1 daPy_HIO_warp_c0::m = {
53, 12, 28, 4, 1.2f, 1.6f, 0.5f, 0.1f, 1.35f,
};
const daPy_HIO_battle_c1 daPy_HIO_battle_c0::m = {
0.0f, 1.5f,
};
const daPy_HIO_dam_c1 daPy_HIO_dam_c0::m = {
30, 20,
};
const daPy_HIO_magicShield_c1 daPy_HIO_magicShield_c0::m = {
60, 0,
};
+3 -2
View File
@@ -39,7 +39,7 @@ JGeometry::TVec3<f32> l_hammer_splash_particle_scale(0.67f, 0.67f, 0.67f);
#include "d/actor/d_a_player_main_data.inc"
#include "d/actor/d_a_player_HIO.inc"
#include "d/actor/d_a_player_HIO_data.inc"
static void dummydatafunc(f32* temp, f64* temp2) {
// temporary hack to improve diffs until sdata2 offsets are figured out
@@ -3975,7 +3975,6 @@ void daPy_lk_c::initTextureScroll() {
/* 80123834-8012469C .text createHeap__9daPy_lk_cFv */
BOOL daPy_lk_c::createHeap() {
/* Nonmatching - daPy_HIO_c constructor */
J3DModelData* tmp_modelData;
J3DAnmTransform* bck;
J3DAnmTevRegKey* brk;
@@ -4789,6 +4788,8 @@ BOOL daPy_lk_c::getBokoFlamePos(cXyz* outPos) {
return FALSE;
}
#include "d/actor/d_a_player_HIO.inc"
static actor_method_class2 l_daPy_Method = {
(process_method_func)daPy_Create,
(process_method_func)daPy_Delete,