d_a_player_main AtParam work

This commit is contained in:
LagoLunatic
2024-02-12 10:11:19 -05:00
parent 919850938d
commit 5c7d0387cf
8 changed files with 120 additions and 30 deletions
+5 -4
View File
@@ -2,6 +2,7 @@
#define D_A_BOKO_H
#include "f_op/f_op_actor.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_cc_d.h"
#include "d/d_bg_s_acch.h"
#include "d/d_particle.h"
@@ -24,14 +25,14 @@ public:
static f32 m_blur_rate[6];
static u8 m_se_type[6];
void getAtPoint() {}
void getAtType() {}
s32 getAtPoint() { return m_at_point[fopAcM_GetParam(this)]; }
u32 getAtType() { return m_at_type[fopAcM_GetParam(this)]; }
void getBlurRate() {}
void getCpsR() {}
f32 getCpsR() { return m_cps_r[fopAcM_GetParam(this)]; }
void getFlameTimer() {}
void getJumpBlurRate() {}
void getNowMode() {}
void getSeType() {}
u8 getSeType() { return m_se_type[fopAcM_GetParam(this)]; }
void moveStateInit(f32 speedForward, f32 speedY, s16 angleY) {
speed.y = speedY;
speedF = speedForward;
+8 -8
View File
@@ -507,13 +507,6 @@ public:
daPyProc_DEMO_ICE_SLIP_e = 0xDA,
};
enum daPy_HEAP_TYPE {
HEAP_TYPE_UNDER_UPPER_e = 0,
HEAP_TYPE_TEXTURE_ANIME_e = 1,
HEAP_TYPE_TEXTURE_SCROLL_e = 2,
HEAP_TYPE_ITEM_ANIME_e = 3,
};
enum daPy_ANM {
ANM_WAITS = 0x00,
ANM_WALK = 0x01,
@@ -751,6 +744,13 @@ public:
ANM_TAKTCHISIN = 0xE9,
};
enum daPy_HEAP_TYPE {
HEAP_TYPE_UNDER_UPPER_e = 0,
HEAP_TYPE_TEXTURE_ANIME_e = 1,
HEAP_TYPE_TEXTURE_SCROLL_e = 2,
HEAP_TYPE_ITEM_ANIME_e = 3,
};
enum daPy_UNDER {
UNDER_MOVE0_e = 0,
UNDER_MOVE1_e = 1,
@@ -1550,7 +1550,7 @@ public:
BOOL procBottleSwing();
BOOL procBottleGet_init();
BOOL procBottleGet();
void setEnemyWeaponAtParam(int);
void setEnemyWeaponAtParam(BOOL);
BOOL procWeaponNormalSwing_init();
BOOL procWeaponNormalSwing();
BOOL procWeaponSideSwing_init();
+5 -1
View File
@@ -51,7 +51,11 @@ enum CcG_Tg_HitMark {
/* 0xC */ G_TG_MARK_PURPLE_HIT = dPa_name::ID_COMMON_PURPLE_HIT,
};
enum dCcG_At_Spl {};
enum dCcG_At_Spl {
/* 0x0 */ dCcG_At_Spl_UNK0 = 0,
/* 0x1 */ dCcG_At_Spl_UNK1 = 1,
/* 0xB */ dCcG_At_Spl_UNKB = 0xB,
};
enum dCcG_Tg_Spl {};