Skip to content

e_hb equivalent / some pal work #2577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Pheenoh merged 3 commits into from
Aug 10, 2025
Merged

e_hb equivalent / some pal work #2577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6801e86
some pal work
TakaRikka Aug 7, 2025
cf1a349
e_hb equivalent
TakaRikka Aug 10, 2025
18a7ff7
update config
TakaRikka Aug 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/GZ2J01/rels/d_a_obj_thdoor/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,4 @@ __vt__10dCcD_GStts = .data:0x00000138; // type:object size:0xC scope:global
__vt__8cM3dGAab = .data:0x00000144; // type:object size:0xC scope:global
__vt__8cM3dGCyl = .data:0x00000150; // type:object size:0xC scope:global
__vt__13daObjThDoor_c = .data:0x0000015C; // type:object size:0x28 scope:global
init$1622 = .bss:0x00000000; // type:object size:0x1 data:byte scope:local
init$1622 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte
2 changes: 1 addition & 1 deletion config/GZ2J01/rels/d_a_obj_toby/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@1012 = .bss:0x0000003C; // type:object size:0x1 scope:local
@1010 = .bss:0x00000040; // type:object size:0x1 scope:local
@1009 = .bss:0x00000044; // type:object size:0x1 scope:local
l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte scope:local
l_HIOInit = .bss:0x00000045; // type:object size:0x1 scope:local data:byte
@3801 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0xC scope:local data:byte
hz_check_pos_x = .bss:0x00000060; // type:object size:0x4 scope:local align:4 data:float
Expand Down
2 changes: 1 addition & 1 deletion config/GZ2J01/rels/d_a_obj_tobyhouse/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@1012 = .bss:0x0000003C; // type:object size:0x1 scope:local
@1010 = .bss:0x00000040; // type:object size:0x1 scope:local
@1009 = .bss:0x00000044; // type:object size:0x1 scope:local
init$1832 = .bss:0x00000045; // type:object size:0x1 data:byte scope:local
init$1832 = .bss:0x00000045; // type:object size:0x1 scope:local data:byte
@4351 = .bss:0x00000048; // type:object size:0xC scope:local
l_shotSmokeScale$4350 = .bss:0x00000058; // type:object size:0xC scope:local
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000064; // type:object size:0x4 scope:global
Expand Down
2 changes: 1 addition & 1 deletion config/GZ2J01/rels/d_a_obj_togeTrap/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000184; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
@3647 = .bss:0x00000008; // type:object size:0xC scope:local
l_HIO = .bss:0x00000014; // type:object size:0x20 scope:local align:4 data:float
init$1675 = .bss:0x00000034; // type:object size:0x1 data:byte scope:local
init$1675 = .bss:0x00000034; // type:object size:0x1 scope:local data:byte
2 changes: 1 addition & 1 deletion config/GZ2J01/rels/d_a_obj_tombo/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,6 @@ __vt__14dBgS_ObjGndChk = .data:0x000000A4; // type:object size:0x30 scope:global
__vt__12J3DFrameCtrl = .data:0x000000D4; // type:object size:0xC scope:global
__vt__14daObj_TomHIO_c = .data:0x000000E0; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte scope:local
l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte
@3770 = .bss:0x0000000C; // type:object size:0xC scope:local
l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global align:4 data:float
4 changes: 2 additions & 2 deletions config/GZ2J01/rels/d_a_obj_volcbom/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,5 @@ __vt__8cM3dGAab = .data:0x000001F0; // type:object size:0xC scope:global
__vt__12dBgS_ObjAcch = .data:0x000001FC; // type:object size:0x24 scope:global
__vt__12J3DFrameCtrl = .data:0x00000220; // type:object size:0xC scope:global
__vt__14daObjVolcBom_c = .data:0x0000022C; // type:object size:0x28 scope:global
init$1712 = .bss:0x00000000; // type:object size:0x1 data:byte scope:local
init$2146 = .bss:0x00000001; // type:object size:0x1 data:byte scope:local
init$1712 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte
init$2146 = .bss:0x00000001; // type:object size:0x1 scope:local data:byte
2 changes: 1 addition & 1 deletion config/GZ2P01/rels/d_a_obj_thdoor/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,4 @@ __vt__10dCcD_GStts = .data:0x00000138; // type:object size:0xC scope:global
__vt__8cM3dGAab = .data:0x00000144; // type:object size:0xC scope:global
__vt__8cM3dGCyl = .data:0x00000150; // type:object size:0xC scope:global
__vt__13daObjThDoor_c = .data:0x0000015C; // type:object size:0x28 scope:global
init$1622 = .bss:0x00000000; // type:object size:0x1 data:byte scope:local
init$1622 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte
2 changes: 1 addition & 1 deletion config/GZ2P01/rels/d_a_obj_toby/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@1012 = .bss:0x0000003C; // type:object size:0x1 scope:local
@1010 = .bss:0x00000040; // type:object size:0x1 scope:local
@1009 = .bss:0x00000044; // type:object size:0x1 scope:local
l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte scope:local
l_HIOInit = .bss:0x00000045; // type:object size:0x1 scope:local data:byte
@3801 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0xC scope:local data:byte
hz_check_pos_x = .bss:0x00000060; // type:object size:0x4 scope:local align:4 data:float
Expand Down
2 changes: 1 addition & 1 deletion config/GZ2P01/rels/d_a_obj_tobyhouse/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@1012 = .bss:0x0000003C; // type:object size:0x1 scope:local
@1010 = .bss:0x00000040; // type:object size:0x1 scope:local
@1009 = .bss:0x00000044; // type:object size:0x1 scope:local
init$1832 = .bss:0x00000045; // type:object size:0x1 data:byte scope:local
init$1832 = .bss:0x00000045; // type:object size:0x1 scope:local data:byte
@4351 = .bss:0x00000048; // type:object size:0xC scope:local
l_shotSmokeScale$4350 = .bss:0x00000058; // type:object size:0xC scope:local
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000064; // type:object size:0x4 scope:global
Expand Down
2 changes: 1 addition & 1 deletion config/GZ2P01/rels/d_a_obj_togeTrap/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000184; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
@3647 = .bss:0x00000008; // type:object size:0xC scope:local
l_HIO = .bss:0x00000014; // type:object size:0x20 scope:local align:4 data:float
init$1675 = .bss:0x00000034; // type:object size:0x1 data:byte scope:local
init$1675 = .bss:0x00000034; // type:object size:0x1 scope:local data:byte
2 changes: 1 addition & 1 deletion config/GZ2P01/rels/d_a_obj_tombo/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,6 @@ __vt__14dBgS_ObjGndChk = .data:0x000000A4; // type:object size:0x30 scope:global
__vt__12J3DFrameCtrl = .data:0x000000D4; // type:object size:0xC scope:global
__vt__14daObj_TomHIO_c = .data:0x000000E0; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte scope:local
l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte
@3770 = .bss:0x0000000C; // type:object size:0xC scope:local
l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global align:4 data:float
4 changes: 2 additions & 2 deletions config/GZ2P01/rels/d_a_obj_volcbom/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,5 @@ __vt__8cM3dGAab = .data:0x000001F0; // type:object size:0xC scope:global
__vt__12dBgS_ObjAcch = .data:0x000001FC; // type:object size:0x24 scope:global
__vt__12J3DFrameCtrl = .data:0x00000220; // type:object size:0xC scope:global
__vt__14daObjVolcBom_c = .data:0x0000022C; // type:object size:0x28 scope:global
init$1712 = .bss:0x00000000; // type:object size:0x1 data:byte scope:local
init$2146 = .bss:0x00000001; // type:object size:0x1 data:byte scope:local
init$1712 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte
init$2146 = .bss:0x00000001; // type:object size:0x1 scope:local data:byte
2 changes: 1 addition & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1545,7 +1545,7 @@ def MatchingFor(*versions) -> bool:
ActorRel(Equivalent, "d_a_e_dn"), # weak func order
ActorRel(Equivalent, "d_a_e_fm"),
ActorRel(MatchingFor("GZ2E01"), "d_a_e_ga"),
ActorRel(NonMatching, "d_a_e_hb"),
ActorRel(Equivalent, "d_a_e_hb"),
ActorRel(MatchingFor("GZ2E01"), "d_a_e_nest"),
ActorRel(Equivalent, "d_a_e_rd"),
ActorRel(MatchingFor("GZ2E01"), "d_a_econt"),
Expand Down
77 changes: 73 additions & 4 deletions include/d/actor/d_a_e_hb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#ifndef D_A_E_HB_H
#define D_A_E_HB_H

#include "f_op/f_op_actor_mng.h"
#include "d/d_bg_s_acch.h"
#include "d/d_cc_d.h"
#include "d/d_cc_uty.h"

/**
* @ingroup actors-enemies
Expand All @@ -10,16 +14,81 @@
* @details
*
*/
class e_hb_class : public fopEn_enemy_c {
private:
/* 0x5ac */ u8 field_0x5ac[0x1268 - 0x5ac];
class e_hb_class {
public:
/* 0x0000 */ fopEn_enemy_c enemy;
/* 0x05AC */ request_of_phase_process_class phase;
/* 0x05B4 */ u8 arg0;
/* 0x05B5 */ u8 arg3;
/* 0x05B6 */ u8 arg1;
/* 0x05B7 */ u8 arg2;
/* 0x05B8 */ mDoExt_McaMorfSO* modelMorf;
/* 0x05BC */ Z2CreatureEnemy sound;
/* 0x0660 */ int anm;
/* 0x0664 */ u32 shadowId;
/* 0x0668 */ s16 counter;
/* 0x066A */ s16 action;
/* 0x066C */ s16 mode;
/* 0x0670 */ f32 pl_search_range;
/* 0x0674 */ cXyz field_0x674;
/* 0x0680 */ s16 field_0x680;
/* 0x0682 */ u8 field_0x682[0x0684 - 0x0682];
/* 0x0684 */ s16 angle_to_player;
/* 0x0688 */ f32 dist_to_player;
/* 0x068C */ s16 field_0x68c;
/* 0x0690 */ f32 field_0x690;
/* 0x0694 */ f32 size;
/* 0x0698 */ s16 timers[3];
/* 0x069E */ s16 invulnerabilityTimer;
/* 0x06A0 */ cXyz field_0x6a0[12];
/* 0x0730 */ csXyz field_0x730[12];
/* 0x0778 */ J3DModel* thornModel[11];
/* 0x07A4 */ u8 field_0x7A4[0x7D8 - 0x7A4];
/* 0x07D8 */ f32 thorn_size[12];
/* 0x0808 */ mDoExt_3DlineMat1_c stalkLine;
/* 0x0844 */ f32 field_0x844;
/* 0x0848 */ f32 field_0x848;
/* 0x084C */ f32 field_0x84c;
/* 0x0850 */ s8 field_0x850;
/* 0x0851 */ s8 field_0x851;
/* 0x0852 */ s8 field_0x852;
/* 0x0854 */ f32 field_0x854;
/* 0x0858 */ u8 field_0x858[0x860 - 0x858];
/* 0x0860 */ dCcD_Stts ccStts;
/* 0x089C */ dCcD_Sph ccSph;
/* 0x09D4 */ dCcD_Sph atSph;
/* 0x0B0C */ s8 field_0xb0c;
/* 0x0B0D */ s8 field_0xb0d;
/* 0x0B10 */ dCcD_Sph kukiSph[4];
/* 0x0FF0 */ dCcU_AtInfo atInfo;
/* 0x1014 */ dBgS_AcchCir acchcir;
/* 0x1054 */ dBgS_ObjAcch acch;
/* 0x122C */ u32 leaf_actor_id;
/* 0x1230 */ s8 field_0x1230;
/* 0x1231 */ s8 field_0x1231;
/* 0x1234 */ u32 field_0x1234[3];
/* 0x1240 */ u32 field_0x1240;
/* 0x1244 */ u32 field_0x1244;
/* 0x1248 */ u32 field_0x1248;
/* 0x124C */ f32 field_0x124c;
/* 0x1250 */ u8 field_0x1250[0x1264 - 0x1250];
/* 0x1264 */ u8 HIOInit;
};

STATIC_ASSERT(sizeof(e_hb_class) == 0x1268);

class daE_HB_HIO_c {
public:
/* 804FBD6C */ daE_HB_HIO_c();
/* 805005D0 */ ~daE_HB_HIO_c();
/* 805005D0 */ virtual ~daE_HB_HIO_c() {}

/* 0x04 */ s8 id;
/* 0x08 */ f32 base_size;
/* 0x0C */ f32 flower_size;
/* 0x10 */ f32 appear_size;
/* 0x14 */ s16 roof_reappear_interval;
/* 0x16 */ s16 attack_freq;
/* 0x18 */ u8 bite_pattern;
};


Expand Down
11 changes: 7 additions & 4 deletions include/d/actor/d_a_obj_carry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,10 +290,13 @@ class daObjCarry_c : public fopAc_ac_c {
field_0xdea = 1;
}

static void make_prm(csXyz* param_1, u8 param_2, u8 param_3, u8 param_4, u8 param_5,
u8 param_6 = 0) {
param_1->x = (param_4 << 8) | param_3;
param_1->z = param_5 | (param_6 << 13) | ((u32(param_2) & 0xFF) << 1);
static void make_prm(u32* o_params, csXyz* o_paramsEx, u8 param_2, u8 i_itemNo, u8 i_itemBit, u8 i_itemType, u8 param_6) {
o_paramsEx->x = (i_itemBit << 8) | (i_itemNo & 0xFF);
o_paramsEx->z = (param_6 << 13) | (param_2 << 1) | i_itemType;
}

static void make_prm_bokkuri(u32* o_params, csXyz* o_paramsEx, u8 i_itemNo, u8 i_itemBit, u8 i_itemType, u8 param_5) {
make_prm(o_params, o_paramsEx, 6, i_itemNo, i_itemBit, i_itemType, param_5);
}

static const daObjCarry_dt_t mData[];
Expand Down
5 changes: 5 additions & 0 deletions include/d/d_com_inf_game.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,7 @@ class dComIfG_play_c {
JKRArchive* getRubyArchive() { return mRubyArchive; }
JKRArchive* getMeterButtonArchive() { return mMeterButtonArchive; }
JKRArchive* getAllMapArchive() { return mAllMapArchive; }
JKRArchive* getCardIconResArchive() { return mCardIconResArchive; }

void setFieldMapArchive2(JKRArchive* arc) { mFieldMapArchive2 = arc; }
void setAnmArchive(JKRArchive* arc) { mAnmArchive = arc; }
Expand Down Expand Up @@ -2293,6 +2294,10 @@ inline JKRArchive* dComIfGp_getMsgCommonArchive() {
return g_dComIfG_gameInfo.play.getMsgCommonArchive();
}

inline JKRArchive* dComIfGp_getCardIconResArchive() {
return g_dComIfG_gameInfo.play.getCardIconResArchive();
}

inline void dComIfGp_setFieldMapArchive2(JKRArchive* arc) {
g_dComIfG_gameInfo.play.setFieldMapArchive2(arc);
}
Expand Down
8 changes: 8 additions & 0 deletions include/d/d_s_logo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ class JKRHeap;
struct ResTIMG;
class dDlst_2D_c;
class mDoDvdThd_mountXArchive_c;
class mDoDvdThd_mountArchive_c;
class mDoDvdThd_toMainRam_c;

class dLog_HIO_c {
Expand Down Expand Up @@ -68,6 +69,10 @@ class dScnLogo_c : public scene_class {
/* 80258520 */ bool isProgressiveMode();
/* 8025854C */ void setRenderMode();

#if VERSION == VERSION_GCN_PAL
u8 getPalLanguage();
#endif

public:
/* 0x1C4 */ request_of_phase_process_class field_0x1c4;
/* 0x1CC */ mDoDvdThd_toMainRam_c* sceneCommand;
Expand All @@ -82,6 +87,9 @@ class dScnLogo_c : public scene_class {
/* 0x1F0 */ dDlst_2D_c* mProgressiveYes;
/* 0x1F4 */ dDlst_2D_c* mProgressiveNo;
/* 0x1F8 */ dDlst_2D_c* mProgressiveSel;
#if VERSION == VERSION_GCN_PAL
/* 0x1FC */ mDoDvdThd_mountArchive_c* mpPalLogoResCommand;
#endif
/* 0x1FC */ request_of_phase_process_class* m_preLoad_dylPhase;
/* 0x200 */ ResTIMG* mProgressivePro;
/* 0x204 */ ResTIMG* mProgressiveInter;
Expand Down
7 changes: 7 additions & 0 deletions include/dolphin/os/OSRtc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ extern "C" {
#define OS_EURGB60_OFF 0
#define OS_EURGB60_ON 1

#define OS_LANGUAGE_ENGLISH 0
#define OS_LANGUAGE_GERMAN 1
#define OS_LANGUAGE_FRENCH 2
#define OS_LANGUAGE_SPANISH 3
#define OS_LANGUAGE_ITALIAN 4
#define OS_LANGUAGE_DUTCH 5

typedef struct OSSram {
u16 checkSum;
u16 checkSumInv;
Expand Down
10 changes: 2 additions & 8 deletions include/f_op/f_op_actor_mng.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,8 +664,8 @@ fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo,
f32* i_speedY, int i_itemBitNo, int param_9,
createFunc i_createFunc);

fpc_ProcID fopAcM_createBokkuri(u16 i_setId, const cXyz* i_pos, int param_3, int param_4,
int i_roomNo, const cXyz* param_6, int param_7, int param_8);
fpc_ProcID fopAcM_createBokkuri(u16 i_setId, const cXyz* i_pos, int i_itemNo, int i_itemBit,
int i_roomNo, const cXyz* param_6, int i_itemType, int param_8);
fpc_ProcID fopAcM_createWarpHole(const cXyz* i_pos, const csXyz* i_angle, int i_roomNo, u8 param_4,
u8 param_5, u8 param_6);

Expand Down Expand Up @@ -708,12 +708,6 @@ inline void make_prm_warp_hole(u32* o_params, u8 prm1, u8 prm2, u8 prm3) {
*o_params = pprm2 | pprm3 | pprm1;
}

inline void make_prm_bokkuri(u32* i_params, csXyz* i_angle, u8 param_2, u8 param_3, u8 param_4,
u8 param_5, u8 param_6) {
i_angle->x = (param_4 << 0x8) | (param_3 & 0xFF);
i_angle->z = (param_6 << 0xD) | (param_2 << 0x1) | param_5;
}

inline fopAc_ac_c* dComIfGp_getPlayer(int);

inline s16 fopAcM_searchPlayerAngleY(const fopAc_ac_c* actor) {
Expand Down
Loading