mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-03 18:03:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Process profiles and enums cleanup (#1031)

Browse Source 
* Fix some profile comments

* Add missing static for local visibility data

* Move proc name and draw priority enums to f_pc

* Add _e suffix to daObjBarrier_c proc enum

* Change proc name enum format to match TP

* Change draw prio enum format to match TP

* Change ItemNo enum format, finish fixing item names

* Revert static for cb1 hio

* Clean up formatting of profile comments

* Fix comment alignment
This commit is contained in:
LagoLunatic
2026-05-26 00:11:58 -04:00
committed by GitHub
parent 79277cb2b2
commit 102042628f
540 changed files with 9562 additions and 10530 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SSystem/SComponent/c_bg_s.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
#include "JSystem/JUtility/JUTAssert.h"
#include "dolphin/types.h"
s32 l_SetCounter = 0;
static s32 l_SetCounter = 0;
/* 80246440-8024645C .text Init__11cBgS_ChkElmFv */
void cBgS_ChkElm::Init() {
src/c/c_damagereaction.cpp
+1 -2
View File
@@ -15,7 +15,6 @@
#include "m_Do/m_Do_mtx.h"
#include "d/d_cc_uty.h"
#include "d/d_bg_s_lin_chk.h"
#include "d/d_procname.h"
cXyz non_pos(-20000.0f, -20000.0f, 20000.0f);
@@ -158,7 +157,7 @@ BOOL enemy_ice(enemyice* ei) {
if (ei->mLightShrinkTimer > (s8)(90 + REG14_S(2))) {
fopAcM_delete(ac);
fopAcM_onActor(ac);
if (fopAcM_GetName(ac) != PROC_PZ) {
if (fopAcM_GetName(ac) != fpcNm_PZ_e) {
// If the actor is not Princess Zelda, drop an item ball.
// TODO: Why the Zelda check? Is she coded to be able to die to Light Arrows?
fopAcM_createIball(&pos, ac->itemTableIdx, fopAcM_GetRoomNo(ac), &ac->current.angle, ac->stealItemBitNo);
src/c/c_dylink.cpp
+432 -432
View File
@@ -5,7 +5,7 @@
#include "c/c_dylink.h"
#include "d/d_com_lib_game.h"
#include "d/d_procname.h"
#include "f_pc/f_pc_name.h"
#include "m_Do/m_Do_dvd_thread.h"
#include "m_Do/m_Do_ext.h"
#include "m_Do/m_Do_printf.h"
@@ -16,7 +16,7 @@
#include "dolphin/os/OS.h"
#include "string.h"
DynamicModuleControlBase * DMC[PROC_COUNT_e];
DynamicModuleControlBase * DMC[fpcNm_MAX_NUM_e];
#if VERSION == VERSION_DEMO
JKRSolidHeap* cCc_solidHeap = NULL;
#else
@@ -26,438 +26,438 @@ volatile BOOL cDyl_Initialized = false;
mDoDvdThd_callback_c * cDyl_DVD = NULL;
const cDyl_DynamicName_t DynamicNameTable[] = {
{PROC_ALLDIE, "d_a_alldie"},
{PROC_TAG_EVSW, "d_a_tag_evsw"},
{PROC_Obj_Swpush, "d_a_obj_swpush"},
{PROC_Obj_Swheavy, "d_a_obj_swheavy"},
{PROC_Obj_Swflat, "d_a_obj_swflat"},
{PROC_Obj_Swlight, "d_a_obj_swlight"},
{PROC_Obj_Swhammer, "d_a_obj_swhammer"},
{PROC_Obj_Quake, "d_a_obj_quake"},
{PROC_Obj_Drift, "d_a_obj_drift"},
{PROC_Tag_Volcano, "d_a_tag_volcano"},
{PROC_TAG_SO, "d_a_tag_so"},
{PROC_Obj_Pbco, "d_a_obj_pbco"},
{PROC_SEATAG, "d_a_seatag"},
{PROC_Obj_Tide, "d_a_obj_tide"},
{PROC_Hmlif, "d_a_hmlif"},
{PROC_SCENECHG, "d_a_scene_change"},
{PROC_Obj_Magmarock, "d_a_obj_magmarock"},
{PROC_Obj_Movebox, "d_a_obj_movebox"},
{PROC_Obj_Tribox, "d_a_obj_tribox"},
{PROC_Obj_Shelf, "d_a_obj_shelf"},
{PROC_Obj_Hlift, "d_a_obj_hlift"},
{PROC_Obj_Hami2, "d_a_obj_hami2"},
{PROC_Obj_Hami3, "d_a_obj_hami3"},
{PROC_Obj_Hami4, "d_a_obj_hami4"},
{PROC_Obj_Hbrf1, "d_a_obj_hbrf1"},
{PROC_Obj_Volcano, "d_a_obj_volcano"},
{PROC_Obj_Vmc, "d_a_obj_vmc"},
{PROC_Obj_Usovmc, "d_a_obj_usovmc"},
{PROC_Obj_Vfan, "d_a_obj_vfan"},
{PROC_Obj_Iceisland, "d_a_obj_iceisland"},
{PROC_Obj_Dragonhead, "d_a_obj_dragonhead"},
{PROC_Obj_Pirateship, "d_a_obj_pirateship"},
{PROC_Obj_Tousekiki, "d_a_obj_tousekiki"},
{PROC_Tag_Ret, "d_a_tag_ret"},
{PROC_Kaji, "d_a_kaji"},
{PROC_Canon, "d_a_canon"},
{PROC_MGBOARD, "d_a_mgameboard"},
{PROC_OBJ_CANON, "d_a_obj_canon"},
{PROC_OBJ_OTBLE, "d_a_obj_otble"},
{PROC_OBJ_WARPT, "d_a_obj_warpt"},
{PROC_OBJ_TORIPOST, "d_a_obj_toripost"},
{PROC_OBJ_IKADA, "d_a_obj_ikada"},
{PROC_OBJ_MJDOOR, "d_a_obj_majyuu_door"},
{PROC_OBJ_PFALL, "d_a_obj_pfall"},
{PROC_OBJ_HOLE, "d_a_obj_hole"},
{PROC_Obj_Stair, "d_a_obj_stair"},
{PROC_Obj_Lpalm, "d_a_obj_lpalm"},
{PROC_Obj_Mtest, "d_a_obj_mtest"},
{PROC_Obj_Mkie, "d_a_obj_mkie"},
{PROC_Obj_Mkiek, "d_a_obj_mkiek"},
{PROC_Obj_MknjD, "d_a_obj_mknjd"},
{PROC_Obj_Msdan, "d_a_obj_msdan"},
{PROC_Obj_MsdanSub, "d_a_obj_msdan_sub"},
{PROC_Obj_Msdan2, "d_a_obj_msdan2"},
{PROC_Obj_MsdanSub2, "d_a_obj_msdan_sub2"},
{PROC_Obj_Nest, "d_a_obj_nest"},
{PROC_Obj_Ojtree, "d_a_obj_ojtree"},
{PROC_Obj_Ospbox, "d_a_obj_ospbox"},
{PROC_Obj_Ladder, "d_a_obj_ladder"},
{PROC_Obj_Smplbg, "d_a_obj_smplbg"},
{PROC_Obj_Akabe, "d_a_obj_akabe"},
{PROC_Obj_Ashut, "d_a_obj_ashut"},
{PROC_BRIDGE, "d_a_bridge"},
{PROC_MSW, "d_a_msw"},
{PROC_MFLFT, "d_a_mflft"},
{PROC_KLFT, "d_a_klft"},
{PROC_ICE_LIFT, "d_a_icelift"},
{PROC_AMI_PROP, "d_a_amiprop"},
{PROC_PEDESTAL, "d_a_pedestal"},
{PROC_FLOOR, "d_a_floor"},
{PROC_KITA, "d_a_kita"},
{PROC_KOKIIE, "d_a_kokiie"},
{PROC_SHAND, "d_a_shand"},
{PROC_BITA, "d_a_bita"},
{PROC_SK, "d_a_sk"},
{PROC_SK2, "d_a_sk2"},
{PROC_SSK, "d_a_ssk"},
{PROC_WARPFLOWER, "d_a_warpf"},
{PROC_WARPFOUT, "d_a_warpfout"},
{PROC_WARPLIGHT, "d_a_warpls"},
{PROC_WARPHYRULE, "d_a_warphr"},
{PROC_WARPDEMO20, "d_a_warpdm20"},
{PROC_WARPGANON, "d_a_warpgn"},
{PROC_WARPMAJYUU, "d_a_warpmj"},
{PROC_Balancelift, "d_a_obj_balancelift"},
{PROC_SHUTTER, "d_a_shutter"},
{PROC_SHUTTER2, "d_a_shutter2"},
{PROC_WINDMILL, "d_a_windmill"},
{PROC_MBDOOR, "d_a_mbdoor"},
{PROC_NPC_DE1, "d_a_npc_de1"},
{PROC_NPC_NZ, "d_a_npc_nz"},
{PROC_NPC_SO, "d_a_npc_so"},
{PROC_FM, "d_a_fm"},
{PROC_LEAF_LIFT, "d_a_leaflift"},
{PROC_Obj_Roten, "d_a_obj_roten"},
{PROC_TOGE, "d_a_toge"},
{PROC_Obj_Ferris, "d_a_obj_ferris"},
{PROC_Obj_Xfuta, "d_a_obj_xfuta"},
{PROC_Obj_Gaship, "d_a_obj_gaship"},
{PROC_Obj_Rforce, "d_a_obj_rforce"},
{PROC_Obj_Gaship2, "d_a_obj_gaship2"},
{PROC_Obj_Light, "d_a_obj_light"},
{PROC_Obj_Homen, "d_a_obj_homen"},
{PROC_Obj_Homensmk, "d_a_obj_homensmoke"},
{PROC_Obj_Ftree, "d_a_obj_ftree"},
{PROC_Obj_Vds, "d_a_obj_Vds"},
{PROC_Obj_Vyasi, "d_a_obj_vyasi"},
{PROC_Obj_Ajav, "d_a_obj_ajav"},
{PROC_Obj_Trap, "d_a_obj_trap"},
{PROC_Obj_Hha, "d_a_obj_hha"},
{PROC_Obj_Htetu1, "d_a_obj_htetu1"},
{PROC_Obj_Gnntakis, "d_a_obj_gnndemotakis"},
{PROC_Obj_Gnntakie, "d_a_obj_gnndemotakie"},
{PROC_Obj_Gnnbtaki, "d_a_obj_gnnbtltaki"},
{PROC_Obj_Rcloud, "d_a_obj_rcloud"},
{PROC_Obj_Gryw00, "d_a_obj_gryw00"},
{PROC_Obj_AjavW, "d_a_obj_AjavW"},
{PROC_Obj_Leaves, "d_a_obj_leaves"},
{PROC_Obj_YLzou, "d_a_obj_YLzou"},
{PROC_Obj_Gbed, "d_a_obj_ganonbed"},
{PROC_Obj_Vteng, "d_a_obj_Vteng"},
{PROC_Obj_Hfuck1, "d_a_obj_hfuck1"},
{PROC_Obj_Ohatch, "d_a_obj_ohatch"},
{PROC_Obj_Hcbh, "d_a_obj_hcbh"},
{PROC_Obj_Ygush00, "d_a_obj_Ygush00"},
{PROC_Obj_Bscurtain, "d_a_obj_bscurtain"},
{PROC_Obj_Shmrgrd, "d_a_obj_shmrgrd"},
{PROC_Obj_Eayogn, "d_a_obj_eayogn"},
{PROC_Obj_Vmsms, "d_a_obj_vmsms"},
{PROC_Obj_Vmsdz, "d_a_obj_vmsdz"},
{PROC_Ygcwp, "d_a_ygcwp"},
{PROC_Obj_Vgnfd, "d_a_obj_vgnfd"},
{PROC_Obj_Kanoke, "d_a_obj_kanoke"},
{PROC_Obj_Eskban, "d_a_obj_eskban"},
{PROC_Obj_Ekskz, "d_a_obj_ekskz"},
{PROC_Obj_Ebomzo, "d_a_obj_ebomzo"},
{PROC_Obj_Kanat, "d_a_obj_kanat"},
{PROC_Obj_Aygr, "d_a_obj_aygr"},
{PROC_SHIP, "d_a_ship"},
{PROC_Obj_Jump, "d_a_obj_jump"},
{PROC_NPC_MK, "d_a_npc_mk"},
{PROC_SAIL, "d_a_sail"},
{PROC_PIRATE_FLAG, "d_a_pirate_flag"},
{PROC_MAJUU_FLAG, "d_a_majuu_flag"},
{PROC_Tori_Flag, "d_a_tori_flag"},
{PROC_Sie_Flag, "d_a_sie_flag"},
{PROC_SYAN, "d_a_syan"},
{PROC_AYUSH, "d_a_ghostship"},
{PROC_OSHIP, "d_a_oship"},
{PROC_RECTANGLE, "d_a_rectangle"},
{PROC_BB, "d_a_bb"},
{PROC_KANBAN, "d_a_kanban"},
{PROC_HITOBJ, "d_a_hitobj"},
{PROC_KT, "d_a_kt"},
{PROC_EP, "d_a_ep"},
{PROC_LAMP, "d_a_lamp"},
{PROC_FF, "d_a_ff"},
{PROC_MO2, "d_a_mo2"},
{PROC_BK, "d_a_bk"},
{PROC_ST, "d_a_st"},
{PROC_TN, "d_a_tn"},
{PROC_MANT, "d_a_mant"},
{PROC_KANTERA, "d_a_kantera"},
{PROC_KAMOME, "d_a_kamome"},
{fpcNm_ALLDIE_e, "d_a_alldie"},
{fpcNm_TAG_EVSW_e, "d_a_tag_evsw"},
{fpcNm_Obj_Swpush_e, "d_a_obj_swpush"},
{fpcNm_Obj_Swheavy_e, "d_a_obj_swheavy"},
{fpcNm_Obj_Swflat_e, "d_a_obj_swflat"},
{fpcNm_Obj_Swlight_e, "d_a_obj_swlight"},
{fpcNm_Obj_Swhammer_e, "d_a_obj_swhammer"},
{fpcNm_Obj_Quake_e, "d_a_obj_quake"},
{fpcNm_Obj_Drift_e, "d_a_obj_drift"},
{fpcNm_Tag_Volcano_e, "d_a_tag_volcano"},
{fpcNm_TAG_SO_e, "d_a_tag_so"},
{fpcNm_Obj_Pbco_e, "d_a_obj_pbco"},
{fpcNm_SEATAG_e, "d_a_seatag"},
{fpcNm_Obj_Tide_e, "d_a_obj_tide"},
{fpcNm_Hmlif_e, "d_a_hmlif"},
{fpcNm_SCENECHG_e, "d_a_scene_change"},
{fpcNm_Obj_Magmarock_e, "d_a_obj_magmarock"},
{fpcNm_Obj_Movebox_e, "d_a_obj_movebox"},
{fpcNm_Obj_Tribox_e, "d_a_obj_tribox"},
{fpcNm_Obj_Shelf_e, "d_a_obj_shelf"},
{fpcNm_Obj_Hlift_e, "d_a_obj_hlift"},
{fpcNm_Obj_Hami2_e, "d_a_obj_hami2"},
{fpcNm_Obj_Hami3_e, "d_a_obj_hami3"},
{fpcNm_Obj_Hami4_e, "d_a_obj_hami4"},
{fpcNm_Obj_Hbrf1_e, "d_a_obj_hbrf1"},
{fpcNm_Obj_Volcano_e, "d_a_obj_volcano"},
{fpcNm_Obj_Vmc_e, "d_a_obj_vmc"},
{fpcNm_Obj_Usovmc_e, "d_a_obj_usovmc"},
{fpcNm_Obj_Vfan_e, "d_a_obj_vfan"},
{fpcNm_Obj_Iceisland_e, "d_a_obj_iceisland"},
{fpcNm_Obj_Dragonhead_e, "d_a_obj_dragonhead"},
{fpcNm_Obj_Pirateship_e, "d_a_obj_pirateship"},
{fpcNm_Obj_Tousekiki_e, "d_a_obj_tousekiki"},
{fpcNm_Tag_Ret_e, "d_a_tag_ret"},
{fpcNm_Kaji_e, "d_a_kaji"},
{fpcNm_Canon_e, "d_a_canon"},
{fpcNm_MGBOARD_e, "d_a_mgameboard"},
{fpcNm_OBJ_CANON_e, "d_a_obj_canon"},
{fpcNm_OBJ_OTBLE_e, "d_a_obj_otble"},
{fpcNm_OBJ_WARPT_e, "d_a_obj_warpt"},
{fpcNm_OBJ_TORIPOST_e, "d_a_obj_toripost"},
{fpcNm_OBJ_IKADA_e, "d_a_obj_ikada"},
{fpcNm_OBJ_MJDOOR_e, "d_a_obj_majyuu_door"},
{fpcNm_OBJ_PFALL_e, "d_a_obj_pfall"},
{fpcNm_OBJ_HOLE_e, "d_a_obj_hole"},
{fpcNm_Obj_Stair_e, "d_a_obj_stair"},
{fpcNm_Obj_Lpalm_e, "d_a_obj_lpalm"},
{fpcNm_Obj_Mtest_e, "d_a_obj_mtest"},
{fpcNm_Obj_Mkie_e, "d_a_obj_mkie"},
{fpcNm_Obj_Mkiek_e, "d_a_obj_mkiek"},
{fpcNm_Obj_MknjD_e, "d_a_obj_mknjd"},
{fpcNm_Obj_Msdan_e, "d_a_obj_msdan"},
{fpcNm_Obj_MsdanSub_e, "d_a_obj_msdan_sub"},
{fpcNm_Obj_Msdan2_e, "d_a_obj_msdan2"},
{fpcNm_Obj_MsdanSub2_e, "d_a_obj_msdan_sub2"},
{fpcNm_Obj_Nest_e, "d_a_obj_nest"},
{fpcNm_Obj_Ojtree_e, "d_a_obj_ojtree"},
{fpcNm_Obj_Ospbox_e, "d_a_obj_ospbox"},
{fpcNm_Obj_Ladder_e, "d_a_obj_ladder"},
{fpcNm_Obj_Smplbg_e, "d_a_obj_smplbg"},
{fpcNm_Obj_Akabe_e, "d_a_obj_akabe"},
{fpcNm_Obj_Ashut_e, "d_a_obj_ashut"},
{fpcNm_BRIDGE_e, "d_a_bridge"},
{fpcNm_MSW_e, "d_a_msw"},
{fpcNm_MFLFT_e, "d_a_mflft"},
{fpcNm_KLFT_e, "d_a_klft"},
{fpcNm_ICE_LIFT_e, "d_a_icelift"},
{fpcNm_AMI_PROP_e, "d_a_amiprop"},
{fpcNm_PEDESTAL_e, "d_a_pedestal"},
{fpcNm_FLOOR_e, "d_a_floor"},
{fpcNm_KITA_e, "d_a_kita"},
{fpcNm_KOKIIE_e, "d_a_kokiie"},
{fpcNm_SHAND_e, "d_a_shand"},
{fpcNm_BITA_e, "d_a_bita"},
{fpcNm_SK_e, "d_a_sk"},
{fpcNm_SK2_e, "d_a_sk2"},
{fpcNm_SSK_e, "d_a_ssk"},
{fpcNm_WARPFLOWER_e, "d_a_warpf"},
{fpcNm_WARPFOUT_e, "d_a_warpfout"},
{fpcNm_WARPLIGHT_e, "d_a_warpls"},
{fpcNm_WARPHYRULE_e, "d_a_warphr"},
{fpcNm_WARPDEMO20_e, "d_a_warpdm20"},
{fpcNm_WARPGANON_e, "d_a_warpgn"},
{fpcNm_WARPMAJYUU_e, "d_a_warpmj"},
{fpcNm_Balancelift_e, "d_a_obj_balancelift"},
{fpcNm_SHUTTER_e, "d_a_shutter"},
{fpcNm_SHUTTER2_e, "d_a_shutter2"},
{fpcNm_WINDMILL_e, "d_a_windmill"},
{fpcNm_MBDOOR_e, "d_a_mbdoor"},
{fpcNm_NPC_DE1_e, "d_a_npc_de1"},
{fpcNm_NPC_NZ_e, "d_a_npc_nz"},
{fpcNm_NPC_SO_e, "d_a_npc_so"},
{fpcNm_FM_e, "d_a_fm"},
{fpcNm_LEAF_LIFT_e, "d_a_leaflift"},
{fpcNm_Obj_Roten_e, "d_a_obj_roten"},
{fpcNm_TOGE_e, "d_a_toge"},
{fpcNm_Obj_Ferris_e, "d_a_obj_ferris"},
{fpcNm_Obj_Xfuta_e, "d_a_obj_xfuta"},
{fpcNm_Obj_Gaship_e, "d_a_obj_gaship"},
{fpcNm_Obj_Rforce_e, "d_a_obj_rforce"},
{fpcNm_Obj_Gaship2_e, "d_a_obj_gaship2"},
{fpcNm_Obj_Light_e, "d_a_obj_light"},
{fpcNm_Obj_Homen_e, "d_a_obj_homen"},
{fpcNm_Obj_Homensmk_e, "d_a_obj_homensmoke"},
{fpcNm_Obj_Ftree_e, "d_a_obj_ftree"},
{fpcNm_Obj_Vds_e, "d_a_obj_Vds"},
{fpcNm_Obj_Vyasi_e, "d_a_obj_vyasi"},
{fpcNm_Obj_Ajav_e, "d_a_obj_ajav"},
{fpcNm_Obj_Trap_e, "d_a_obj_trap"},
{fpcNm_Obj_Hha_e, "d_a_obj_hha"},
{fpcNm_Obj_Htetu1_e, "d_a_obj_htetu1"},
{fpcNm_Obj_Gnntakis_e, "d_a_obj_gnndemotakis"},
{fpcNm_Obj_Gnntakie_e, "d_a_obj_gnndemotakie"},
{fpcNm_Obj_Gnnbtaki_e, "d_a_obj_gnnbtltaki"},
{fpcNm_Obj_Rcloud_e, "d_a_obj_rcloud"},
{fpcNm_Obj_Gryw00_e, "d_a_obj_gryw00"},
{fpcNm_Obj_AjavW_e, "d_a_obj_AjavW"},
{fpcNm_Obj_Leaves_e, "d_a_obj_leaves"},
{fpcNm_Obj_YLzou_e, "d_a_obj_YLzou"},
{fpcNm_Obj_Gbed_e, "d_a_obj_ganonbed"},
{fpcNm_Obj_Vteng_e, "d_a_obj_Vteng"},
{fpcNm_Obj_Hfuck1_e, "d_a_obj_hfuck1"},
{fpcNm_Obj_Ohatch_e, "d_a_obj_ohatch"},
{fpcNm_Obj_Hcbh_e, "d_a_obj_hcbh"},
{fpcNm_Obj_Ygush00_e, "d_a_obj_Ygush00"},
{fpcNm_Obj_Bscurtain_e, "d_a_obj_bscurtain"},
{fpcNm_Obj_Shmrgrd_e, "d_a_obj_shmrgrd"},
{fpcNm_Obj_Eayogn_e, "d_a_obj_eayogn"},
{fpcNm_Obj_Vmsms_e, "d_a_obj_vmsms"},
{fpcNm_Obj_Vmsdz_e, "d_a_obj_vmsdz"},
{fpcNm_Ygcwp_e, "d_a_ygcwp"},
{fpcNm_Obj_Vgnfd_e, "d_a_obj_vgnfd"},
{fpcNm_Obj_Kanoke_e, "d_a_obj_kanoke"},
{fpcNm_Obj_Eskban_e, "d_a_obj_eskban"},
{fpcNm_Obj_Ekskz_e, "d_a_obj_ekskz"},
{fpcNm_Obj_Ebomzo_e, "d_a_obj_ebomzo"},
{fpcNm_Obj_Kanat_e, "d_a_obj_kanat"},
{fpcNm_Obj_Aygr_e, "d_a_obj_aygr"},
{fpcNm_SHIP_e, "d_a_ship"},
{fpcNm_Obj_Jump_e, "d_a_obj_jump"},
{fpcNm_NPC_MK_e, "d_a_npc_mk"},
{fpcNm_SAIL_e, "d_a_sail"},
{fpcNm_PIRATE_FLAG_e, "d_a_pirate_flag"},
{fpcNm_MAJUU_FLAG_e, "d_a_majuu_flag"},
{fpcNm_Tori_Flag_e, "d_a_tori_flag"},
{fpcNm_Sie_Flag_e, "d_a_sie_flag"},
{fpcNm_SYAN_e, "d_a_syan"},
{fpcNm_AYUSH_e, "d_a_ghostship"},
{fpcNm_OSHIP_e, "d_a_oship"},
{fpcNm_RECTANGLE_e, "d_a_rectangle"},
{fpcNm_BB_e, "d_a_bb"},
{fpcNm_KANBAN_e, "d_a_kanban"},
{fpcNm_HITOBJ_e, "d_a_hitobj"},
{fpcNm_KT_e, "d_a_kt"},
{fpcNm_EP_e, "d_a_ep"},
{fpcNm_LAMP_e, "d_a_lamp"},
{fpcNm_FF_e, "d_a_ff"},
{fpcNm_MO2_e, "d_a_mo2"},
{fpcNm_BK_e, "d_a_bk"},
{fpcNm_ST_e, "d_a_st"},
{fpcNm_TN_e, "d_a_tn"},
{fpcNm_MANT_e, "d_a_mant"},
{fpcNm_KANTERA_e, "d_a_kantera"},
{fpcNm_KAMOME_e, "d_a_kamome"},
#if VERSION == VERSION_DEMO
{PROC_KAMOME2, "d_a_kamome2"},
{fpcNm_KAMOME2_e, "d_a_kamome2"},
#endif
{PROC_NPC_KAM, "d_a_npc_kamome"},
{PROC_WBIRD, "d_a_wbird"},
{PROC_DEMO_KMM, "d_a_demo_kmm"},
{PROC_NZ, "d_a_nz"},
{PROC_NZG, "d_a_nzg"},
{PROC_KN, "d_a_kn"},
{PROC_DEMO_DK, "d_a_demo_dk"},
{PROC_AM, "d_a_am"},
{PROC_AM2, "d_a_am2"},
{PROC_GM, "d_a_gm"},
{PROC_KS, "d_a_ks"},
{PROC_CC, "d_a_cc"},
{PROC_BL, "d_a_bl"},
{PROC_WZ, "d_a_wz"},
{PROC_PH, "d_a_ph"},
{PROC_PZ, "d_a_pz"},
{PROC_BPW, "d_a_bpw"},
{PROC_PW, "d_a_pw"},
{PROC_JBO, "d_a_jbo"},
{PROC_BO, "d_a_bo"},
{PROC_KI, "d_a_ki"},
{PROC_MT, "d_a_mt"},
{PROC_BWD, "d_a_bwd"},
{PROC_BWDS, "d_a_bwds"},
{PROC_BWDG, "d_a_bwdg"},
{PROC_KB, "d_a_kb"},
{PROC_DR, "d_a_dr"},
{PROC_DR2, "d_a_dr2"},
{PROC_RD, "d_a_rd"},
{PROC_DAIOCTA, "d_a_daiocta"},
{PROC_DAIOCTA_EYE, "d_a_daiocta_eye"},
{PROC_OQ, "d_a_oq"},
{PROC_GY, "d_a_gy"},
{PROC_GY_CTRL, "d_a_gy_ctrl"},
{PROC_GY_CTRLB, "d_a_gy_ctrl"},
{PROC_Hot_Floor, "d_a_hot_floor"},
{PROC_Beam, "d_a_beam"},
{PROC_Bemos, "d_a_obj_bemos"},
{PROC_BTD, "d_a_btd"},
{PROC_BMD, "d_a_bmd"},
{PROC_BMDHAND, "d_a_bmdhand"},
{PROC_BMDFOOT, "d_a_bmdfoot"},
{PROC_DK, "d_a_dk"},
{PROC_BDK, "d_a_bdk"},
{PROC_BDKOBJ, "d_a_bdkobj"},
{PROC_BST, "d_a_bst"},
{PROC_FGANON, "d_a_fganon"},
{PROC_FGMAHOU, "d_a_fgmahou"},
{PROC_BGN, "d_a_bgn"},
{PROC_BGN2, "d_a_bgn2"},
{PROC_BGN3, "d_a_bgn3"},
{PROC_GND, "d_a_gnd"},
{PROC_PT, "d_a_pt"},
{PROC_SWTDOOR, "d_a_swtdoor"},
{PROC_MOZO, "d_a_mozo"},
{PROC_KUI, "d_a_kui"},
{PROC_SS, "d_a_ss"},
{PROC_SSS, "d_a_sss"},
{PROC_SITEM, "d_a_sitem"},
{PROC_MACHINE, "d_a_machine"},
{PROC_BOSSITEM, "d_a_boss_item"},
{PROC_Demo_Item, "d_a_demo_item"},
{PROC_RACEITEM, "d_a_race_item"},
{PROC_ShopItem, "d_a_shop_item"},
{PROC_DEKU_ITEM, "d_a_deku_item"},
{PROC_Obj_Paper, "d_a_obj_paper"},
{PROC_Obj_Demo_Barrel,"d_a_obj_demo_barrel"},
{PROC_Obj_Dmgroom, "d_a_obj_dmgroom"},
{PROC_Obj_Doguu, "d_a_obj_doguu"},
{PROC_Obj_Wood, "d_a_obj_wood"},
{PROC_Obj_Flame, "d_a_obj_flame"},
{PROC_Obj_Buoyrace, "d_a_obj_buoyrace"},
{PROC_Obj_Coming, "d_a_obj_coming"},
{PROC_Coming2, "d_a_coming2"},
{PROC_Coming3, "d_a_coming3"},
{PROC_Obj_Mmrr, "d_a_obj_mmrr"},
{PROC_Obj_Pbka, "d_a_obj_pbka"},
{PROC_Obj_Plant, "d_a_obj_plant"},
{PROC_Obj_Gtaki, "d_a_obj_gtaki"},
{PROC_Obj_Yboil, "d_a_obj_Yboil"},
{PROC_Obj_Rflw, "d_a_obj_rflw"},
{PROC_Obj_Table, "d_a_obj_table"},
{PROC_Obj_Tenmado, "d_a_obj_tenmado"},
{PROC_Obj_Cafelmp, "d_a_obj_cafelmp"},
{PROC_Obj_Apzl, "d_a_obj_apzl"},
{PROC_Obj_Adnno, "d_a_obj_adnno"},
{PROC_Obj_Auzu, "d_a_obj_auzu"},
{PROC_Obj_Gong, "d_a_obj_gong"},
{PROC_Obj_Barrier, "d_a_obj_barrier"},
{PROC_Obj_Firewall, "d_a_obj_firewall"},
{PROC_Obj_TnTrap, "d_a_obj_tntrap"},
{PROC_Obj_Monument, "d_a_obj_monument"},
{PROC_Obj_Tapestry, "d_a_obj_tapestry"},
{PROC_Obj_HSH, "d_a_obj_hsehi1"},
{PROC_Goal_Flag, "d_a_goal_flag"},
{PROC_TBOX, "d_a_tbox"},
{PROC_SBOX, "d_a_sbox"},
{PROC_BOMB_FLOWER, "d_a_bflower"},
{PROC_ACORN_LEAF, "d_a_acorn_leaf"},
{PROC_SWC00, "d_a_swc00"},
{PROC_FAN, "d_a_fan"},
{PROC_DOOR10, "d_a_door10"},
{PROC_DOOR12, "d_a_door12"},
{PROC_ATDOOR, "d_a_atdoor"},
{PROC_MDOOR, "d_a_mdoor"},
{PROC_KDDOOR, "d_a_kddoor"},
{PROC_KNOB00, "d_a_knob00"},
{PROC_MTOGE, "d_a_mtoge"},
{PROC_ANDSW0, "d_a_andsw0"},
{PROC_ANDSW2, "d_a_andsw2"},
{PROC_DAI, "d_a_dai"},
{PROC_SW_ATTACK, "d_a_swattack"},
{PROC_SW_ITEM, "d_a_switem"},
{PROC_SW_TACT, "d_a_swtact"},
{PROC_NPC_OS, "d_a_npc_os"},
{PROC_NPC_YM1, "d_a_npc_ym1"},
{PROC_NPC_YM2, "d_a_npc_ym1"},
{PROC_NPC_YW1, "d_a_npc_yw1"},
{PROC_NPC_JI1, "d_a_npc_ji1"},
{PROC_NPC_KO1, "d_a_npc_ko1"},
{PROC_NPC_KO2, "d_a_npc_ko1"},
{PROC_NPC_LS1, "d_a_npc_ls1"},
{PROC_NPC_P1, "d_a_npc_p1"},
{PROC_NPC_P2, "d_a_npc_p2"},
{PROC_NPC_SARACE, "d_a_npc_sarace"},
{PROC_NPC_TC, "d_a_npc_tc"},
{PROC_NPC_BM1, "d_a_npc_bm1"},
{PROC_NPC_BM2, "d_a_npc_bm1"},
{PROC_NPC_BM3, "d_a_npc_bm1"},
{PROC_NPC_BM4, "d_a_npc_bm1"},
{PROC_NPC_BM5, "d_a_npc_bm1"},
{PROC_NPC_OB1, "d_a_npc_ob1"},
{PROC_NPC_AJ1, "d_a_npc_aj1"},
{PROC_NPC_KM1, "d_a_npc_km1"},
{PROC_NPC_CB1, "d_a_npc_cb1"},
{PROC_NPC_BA1, "d_a_npc_ba1"},
{PROC_NPC_BJ1, "d_a_npc_bj1"},
{PROC_NPC_BJ2, "d_a_npc_bj1"},
{PROC_NPC_BJ3, "d_a_npc_bj1"},
{PROC_NPC_BJ4, "d_a_npc_bj1"},
{PROC_NPC_BJ5, "d_a_npc_bj1"},
{PROC_NPC_BJ6, "d_a_npc_bj1"},
{PROC_NPC_BJ7, "d_a_npc_bj1"},
{PROC_NPC_BJ8, "d_a_npc_bj1"},
{PROC_NPC_BJ9, "d_a_npc_bj1"},
{PROC_NPC_BS1, "d_a_npc_bs1"},
{PROC_NPC_BMCON1, "d_a_npc_bmcon1"},
{PROC_NPC_BMS1, "d_a_npc_bms1"},
{PROC_NPC_BMSW, "d_a_npc_bmsw"},
{PROC_NPC_BTSW, "d_a_npc_btsw"},
{PROC_NPC_BTSW2, "d_a_npc_btsw2"},
{PROC_NPC_DS1, "d_a_npc_ds1"},
{PROC_NPC_RSH1, "d_a_npc_rsh1"},
{PROC_NPC_KK1, "d_a_npc_kk1"},
{PROC_NPC_PM1, "d_a_npc_pm1"},
{PROC_NPC_KP1, "d_a_npc_kp1"},
{PROC_NPC_PF1, "d_a_npc_pf1"},
{PROC_NPC_GP1, "d_a_npc_gp1"},
{PROC_NPC_JB1, "d_a_npc_jb1"},
{PROC_NPC_KF1, "d_a_npc_kf1"},
{PROC_NPC_AUCTION, "d_a_npc_auction"},
{PROC_NPC_KG1, "d_a_npc_kg1"},
{PROC_NPC_KG2, "d_a_npc_kg2"},
{PROC_NPC_TT, "d_a_npc_tt"},
{PROC_NPC_HR, "d_a_npc_hr"},
{PROC_NPC_HO, "d_a_npc_ho"},
{PROC_NPC_MD, "d_a_npc_md"},
{PROC_NPC_UK, "d_a_npc_uk"},
{PROC_BIGELF, "d_a_bigelf"},
{PROC_NPC_CO1, "d_a_npc_co1"},
{PROC_NPC_ZK1, "d_a_npc_zk1"},
{PROC_NPC_ROTEN, "d_a_npc_roten"},
{PROC_NPC_PEOPLE, "d_a_npc_people"},
{PROC_NPC_GK1, "d_a_npc_gk1"},
{PROC_NPC_PHOTO, "d_a_npc_photo"},
{PROC_NPC_AC1, "d_a_npc_ac1"},
{PROC_NPC_HI1, "d_a_npc_hi1"},
{PROC_NPC_SV, "d_a_npc_sv"},
{PROC_NPC_MT, "d_a_npc_mt"},
{PROC_NPC_MN, "d_a_npc_mn"},
{PROC_NPC_AH, "d_a_npc_ah"},
{PROC_AUCTION, "d_a_auction"},
{PROC_KYTAG00, "d_a_kytag00"},
{PROC_KYTAG01, "d_a_kytag01"},
{PROC_KYTAG02, "d_a_kytag02"},
{PROC_KYTAG03, "d_a_kytag03"},
{PROC_KYTAG04, "d_a_kytag04"},
{PROC_KYTAG05, "d_a_kytag05"},
{PROC_KYTAG06, "d_a_kytag06"},
{PROC_KYTAG07, "d_a_kytag07"},
{PROC_WindTag, "d_a_wind_tag"},
{PROC_YOUGAN, "d_a_yougan"},
{PROC_Mmusic, "d_a_mmusic"},
{PROC_Komore, "d_a_komore"},
{PROC_Tpota, "d_a_tpota"},
{PROC_Obj_Itnak, "d_a_obj_Itnak"},
{PROC_Obj_Zouk, "d_a_obj_zouK"},
{PROC_Ykgr, "d_a_ykgr"},
{PROC_SAKU, "d_a_saku"},
{PROC_Salvage, "d_a_salvage"},
{PROC_SALVAGE_TBOX, "d_a_salvage_tbox"},
{PROC_Kmon, "d_a_kmon"},
{PROC_OBJ_FIGURE, "d_a_obj_figure"},
{PROC_OBJ_HAT, "d_a_obj_hat"},
{PROC_Lwood, "d_a_lwood"},
{PROC_Dummy, "d_a_dummy"},
{PROC_TAG_EVENT, "d_a_tag_event"},
{PROC_TAG_HINT, "d_a_tag_hint"},
{PROC_TAG_MSG, "d_a_tag_msg"},
{PROC_TAG_ETC, "d_a_tag_etc"},
{PROC_TAG_ISLAND, "d_a_tag_island"},
{PROC_TAG_KF1, "d_a_tag_kf1"},
{PROC_TAG_KK1, "d_a_tag_kk1"},
{PROC_TAG_PHOTO, "d_a_tag_photo"},
{PROC_TAG_KB_ITEM, "d_a_tag_kb_item"},
{PROC_TAG_MK, "d_a_tag_mk"},
{PROC_TAG_MDCB, "d_a_tag_md_cb"},
{PROC_TAG_BA1, "d_a_tag_ba1"},
{PROC_TagRock, "d_a_fallrock_tag"},
{PROC_FallRock, "d_a_fallrock"},
{PROC_SteamTag, "d_a_steam_tag"},
{PROC_Fire, "d_a_fire"},
{PROC_BRANCH, "d_a_branch"},
{PROC_NPC_ZL1, "d_a_npc_zl1"},
{PROC_WATERFALL, "d_a_waterfall"},
{PROC_LIGHTBRIDGE, "d_a_lbridge"},
{PROC_LIGHTSTAIR, "d_a_lstair"},
{PROC_WALL, "d_a_wall"},
{PROC_SW_PROPELLER, "d_a_swpropeller"},
{PROC_IKARI, "d_a_ikari"},
{PROC_AGBSW0, "d_a_agbsw0"},
{PROC_MAGMA, "d_a_magma"},
{PROC_GRASS, "d_a_grass"},
{PROC_Obj_Tower, "d_a_obj_tower"},
{PROC_Obj_DoguuD, "d_a_obj_doguu_demo"},
{PROC_SPOTBOX, "d_a_spotbox"},
{PROC_TORNADO, "d_a_tornado"},
{PROC_TITLE, "d_a_title"},
{PROC_MP, "d_a_movie_player"},
{PROC_LODBG, "d_a_lod_bg"},
{PROC_HIMO3, "d_a_himo3"},
{PROC_ATT, "d_a_att"},
{PROC_Hys, "d_a_hys"},
{PROC_SWHIT0, "d_a_swhit0"},
{PROC_TAG_GSHIP, "d_a_tag_ghostship"},
{PROC_TSUBO, "d_a_tsubo"},
{PROC_STONE, "d_a_stone"},
{PROC_Stone2, "d_a_stone2"},
{PROC_Obj_Barrel, "d_a_obj_barrel"},
{PROC_Obj_Barrel2, "d_a_obj_barrel2"},
{PROC_Obj_Try, "d_a_obj_try"},
{PROC_Obj_Vtil, "d_a_obj_vtil"},
{PROC_Obj_Ice, "d_a_obj_ice"},
{PROC_Obj_Mshokki, "d_a_obj_mshokki"},
{PROC_BOKO, "d_a_boko"},
{PROC_TAMA, "d_a_tama"},
{PROC_Obj_Buoyflag, "d_a_obj_buoyflag"},
{PROC_Obj_Correct, "d_a_obj_correct"},
{PROC_Obj_Eff, "d_a_obj_eff"},
{PROC_Tag_Light, "d_a_tag_light"},
{PROC_Tag_Attention, "d_a_tag_attention"},
{PROC_Tag_Waterlevel, "d_a_tag_waterlevel"},
{PROC_ARROW_ICEEFF, "d_a_arrow_iceeff"},
{PROC_ARROW_LIGHTEFF, "d_a_arrow_lighteff"},
{PROC_Obj_Timer, "d_a_obj_timer"},
{fpcNm_NPC_KAM_e, "d_a_npc_kamome"},
{fpcNm_WBIRD_e, "d_a_wbird"},
{fpcNm_DEMO_KMM_e, "d_a_demo_kmm"},
{fpcNm_NZ_e, "d_a_nz"},
{fpcNm_NZG_e, "d_a_nzg"},
{fpcNm_KN_e, "d_a_kn"},
{fpcNm_DEMO_DK_e, "d_a_demo_dk"},
{fpcNm_AM_e, "d_a_am"},
{fpcNm_AM2_e, "d_a_am2"},
{fpcNm_GM_e, "d_a_gm"},
{fpcNm_KS_e, "d_a_ks"},
{fpcNm_CC_e, "d_a_cc"},
{fpcNm_BL_e, "d_a_bl"},
{fpcNm_WZ_e, "d_a_wz"},
{fpcNm_PH_e, "d_a_ph"},
{fpcNm_PZ_e, "d_a_pz"},
{fpcNm_BPW_e, "d_a_bpw"},
{fpcNm_PW_e, "d_a_pw"},
{fpcNm_JBO_e, "d_a_jbo"},
{fpcNm_BO_e, "d_a_bo"},
{fpcNm_KI_e, "d_a_ki"},
{fpcNm_MT_e, "d_a_mt"},
{fpcNm_BWD_e, "d_a_bwd"},
{fpcNm_BWDS_e, "d_a_bwds"},
{fpcNm_BWDG_e, "d_a_bwdg"},
{fpcNm_KB_e, "d_a_kb"},
{fpcNm_DR_e, "d_a_dr"},
{fpcNm_DR2_e, "d_a_dr2"},
{fpcNm_RD_e, "d_a_rd"},
{fpcNm_DAIOCTA_e, "d_a_daiocta"},
{fpcNm_DAIOCTA_EYE_e, "d_a_daiocta_eye"},
{fpcNm_OQ_e, "d_a_oq"},
{fpcNm_GY_e, "d_a_gy"},
{fpcNm_GY_CTRL_e, "d_a_gy_ctrl"},
{fpcNm_GY_CTRLB_e, "d_a_gy_ctrl"},
{fpcNm_Hot_Floor_e, "d_a_hot_floor"},
{fpcNm_Beam_e, "d_a_beam"},
{fpcNm_Bemos_e, "d_a_obj_bemos"},
{fpcNm_BTD_e, "d_a_btd"},
{fpcNm_BMD_e, "d_a_bmd"},
{fpcNm_BMDHAND_e, "d_a_bmdhand"},
{fpcNm_BMDFOOT_e, "d_a_bmdfoot"},
{fpcNm_DK_e, "d_a_dk"},
{fpcNm_BDK_e, "d_a_bdk"},
{fpcNm_BDKOBJ_e, "d_a_bdkobj"},
{fpcNm_BST_e, "d_a_bst"},
{fpcNm_FGANON_e, "d_a_fganon"},
{fpcNm_FGMAHOU_e, "d_a_fgmahou"},
{fpcNm_BGN_e, "d_a_bgn"},
{fpcNm_BGN2_e, "d_a_bgn2"},
{fpcNm_BGN3_e, "d_a_bgn3"},
{fpcNm_GND_e, "d_a_gnd"},
{fpcNm_PT_e, "d_a_pt"},
{fpcNm_SWTDOOR_e, "d_a_swtdoor"},
{fpcNm_MOZO_e, "d_a_mozo"},
{fpcNm_KUI_e, "d_a_kui"},
{fpcNm_SS_e, "d_a_ss"},
{fpcNm_SSS_e, "d_a_sss"},
{fpcNm_SITEM_e, "d_a_sitem"},
{fpcNm_MACHINE_e, "d_a_machine"},
{fpcNm_BOSSITEM_e, "d_a_boss_item"},
{fpcNm_Demo_Item_e, "d_a_demo_item"},
{fpcNm_RACEITEM_e, "d_a_race_item"},
{fpcNm_ShopItem_e, "d_a_shop_item"},
{fpcNm_DEKU_ITEM_e, "d_a_deku_item"},
{fpcNm_Obj_Paper_e, "d_a_obj_paper"},
{fpcNm_Obj_Demo_Barrel_e,"d_a_obj_demo_barrel"},
{fpcNm_Obj_Dmgroom_e, "d_a_obj_dmgroom"},
{fpcNm_Obj_Doguu_e, "d_a_obj_doguu"},
{fpcNm_Obj_Wood_e, "d_a_obj_wood"},
{fpcNm_Obj_Flame_e, "d_a_obj_flame"},
{fpcNm_Obj_Buoyrace_e, "d_a_obj_buoyrace"},
{fpcNm_Obj_Coming_e, "d_a_obj_coming"},
{fpcNm_Coming2_e, "d_a_coming2"},
{fpcNm_Coming3_e, "d_a_coming3"},
{fpcNm_Obj_Mmrr_e, "d_a_obj_mmrr"},
{fpcNm_Obj_Pbka_e, "d_a_obj_pbka"},
{fpcNm_Obj_Plant_e, "d_a_obj_plant"},
{fpcNm_Obj_Gtaki_e, "d_a_obj_gtaki"},
{fpcNm_Obj_Yboil_e, "d_a_obj_Yboil"},
{fpcNm_Obj_Rflw_e, "d_a_obj_rflw"},
{fpcNm_Obj_Table_e, "d_a_obj_table"},
{fpcNm_Obj_Tenmado_e, "d_a_obj_tenmado"},
{fpcNm_Obj_Cafelmp_e, "d_a_obj_cafelmp"},
{fpcNm_Obj_Apzl_e, "d_a_obj_apzl"},
{fpcNm_Obj_Adnno_e, "d_a_obj_adnno"},
{fpcNm_Obj_Auzu_e, "d_a_obj_auzu"},
{fpcNm_Obj_Gong_e, "d_a_obj_gong"},
{fpcNm_Obj_Barrier_e, "d_a_obj_barrier"},
{fpcNm_Obj_Firewall_e, "d_a_obj_firewall"},
{fpcNm_Obj_TnTrap_e, "d_a_obj_tntrap"},
{fpcNm_Obj_Monument_e, "d_a_obj_monument"},
{fpcNm_Obj_Tapestry_e, "d_a_obj_tapestry"},
{fpcNm_Obj_HSH_e, "d_a_obj_hsehi1"},
{fpcNm_Goal_Flag_e, "d_a_goal_flag"},
{fpcNm_TBOX_e, "d_a_tbox"},
{fpcNm_SBOX_e, "d_a_sbox"},
{fpcNm_BOMB_FLOWER_e, "d_a_bflower"},
{fpcNm_ACORN_LEAF_e, "d_a_acorn_leaf"},
{fpcNm_SWC00_e, "d_a_swc00"},
{fpcNm_FAN_e, "d_a_fan"},
{fpcNm_DOOR10_e, "d_a_door10"},
{fpcNm_DOOR12_e, "d_a_door12"},
{fpcNm_ATDOOR_e, "d_a_atdoor"},
{fpcNm_MDOOR_e, "d_a_mdoor"},
{fpcNm_KDDOOR_e, "d_a_kddoor"},
{fpcNm_KNOB00_e, "d_a_knob00"},
{fpcNm_MTOGE_e, "d_a_mtoge"},
{fpcNm_ANDSW0_e, "d_a_andsw0"},
{fpcNm_ANDSW2_e, "d_a_andsw2"},
{fpcNm_DAI_e, "d_a_dai"},
{fpcNm_SW_ATTACK_e, "d_a_swattack"},
{fpcNm_SW_ITEM_e, "d_a_switem"},
{fpcNm_SW_TACT_e, "d_a_swtact"},
{fpcNm_NPC_OS_e, "d_a_npc_os"},
{fpcNm_NPC_YM1_e, "d_a_npc_ym1"},
{fpcNm_NPC_YM2_e, "d_a_npc_ym1"},
{fpcNm_NPC_YW1_e, "d_a_npc_yw1"},
{fpcNm_NPC_JI1_e, "d_a_npc_ji1"},
{fpcNm_NPC_KO1_e, "d_a_npc_ko1"},
{fpcNm_NPC_KO2_e, "d_a_npc_ko1"},
{fpcNm_NPC_LS1_e, "d_a_npc_ls1"},
{fpcNm_NPC_P1_e, "d_a_npc_p1"},
{fpcNm_NPC_P2_e, "d_a_npc_p2"},
{fpcNm_NPC_SARACE_e, "d_a_npc_sarace"},
{fpcNm_NPC_TC_e, "d_a_npc_tc"},
{fpcNm_NPC_BM1_e, "d_a_npc_bm1"},
{fpcNm_NPC_BM2_e, "d_a_npc_bm1"},
{fpcNm_NPC_BM3_e, "d_a_npc_bm1"},
{fpcNm_NPC_BM4_e, "d_a_npc_bm1"},
{fpcNm_NPC_BM5_e, "d_a_npc_bm1"},
{fpcNm_NPC_OB1_e, "d_a_npc_ob1"},
{fpcNm_NPC_AJ1_e, "d_a_npc_aj1"},
{fpcNm_NPC_KM1_e, "d_a_npc_km1"},
{fpcNm_NPC_CB1_e, "d_a_npc_cb1"},
{fpcNm_NPC_BA1_e, "d_a_npc_ba1"},
{fpcNm_NPC_BJ1_e, "d_a_npc_bj1"},
{fpcNm_NPC_BJ2_e, "d_a_npc_bj1"},
{fpcNm_NPC_BJ3_e, "d_a_npc_bj1"},
{fpcNm_NPC_BJ4_e, "d_a_npc_bj1"},
{fpcNm_NPC_BJ5_e, "d_a_npc_bj1"},
{fpcNm_NPC_BJ6_e, "d_a_npc_bj1"},
{fpcNm_NPC_BJ7_e, "d_a_npc_bj1"},
{fpcNm_NPC_BJ8_e, "d_a_npc_bj1"},
{fpcNm_NPC_BJ9_e, "d_a_npc_bj1"},
{fpcNm_NPC_BS1_e, "d_a_npc_bs1"},
{fpcNm_NPC_BMCON1_e, "d_a_npc_bmcon1"},
{fpcNm_NPC_BMS1_e, "d_a_npc_bms1"},
{fpcNm_NPC_BMSW_e, "d_a_npc_bmsw"},
{fpcNm_NPC_BTSW_e, "d_a_npc_btsw"},
{fpcNm_NPC_BTSW2_e, "d_a_npc_btsw2"},
{fpcNm_NPC_DS1_e, "d_a_npc_ds1"},
{fpcNm_NPC_RSH1_e, "d_a_npc_rsh1"},
{fpcNm_NPC_KK1_e, "d_a_npc_kk1"},
{fpcNm_NPC_PM1_e, "d_a_npc_pm1"},
{fpcNm_NPC_KP1_e, "d_a_npc_kp1"},
{fpcNm_NPC_PF1_e, "d_a_npc_pf1"},
{fpcNm_NPC_GP1_e, "d_a_npc_gp1"},
{fpcNm_NPC_JB1_e, "d_a_npc_jb1"},
{fpcNm_NPC_KF1_e, "d_a_npc_kf1"},
{fpcNm_NPC_AUCTION_e, "d_a_npc_auction"},
{fpcNm_NPC_KG1_e, "d_a_npc_kg1"},
{fpcNm_NPC_KG2_e, "d_a_npc_kg2"},
{fpcNm_NPC_TT_e, "d_a_npc_tt"},
{fpcNm_NPC_HR_e, "d_a_npc_hr"},
{fpcNm_NPC_HO_e, "d_a_npc_ho"},
{fpcNm_NPC_MD_e, "d_a_npc_md"},
{fpcNm_NPC_UK_e, "d_a_npc_uk"},
{fpcNm_BIGELF_e, "d_a_bigelf"},
{fpcNm_NPC_CO1_e, "d_a_npc_co1"},
{fpcNm_NPC_ZK1_e, "d_a_npc_zk1"},
{fpcNm_NPC_ROTEN_e, "d_a_npc_roten"},
{fpcNm_NPC_PEOPLE_e, "d_a_npc_people"},
{fpcNm_NPC_GK1_e, "d_a_npc_gk1"},
{fpcNm_NPC_PHOTO_e, "d_a_npc_photo"},
{fpcNm_NPC_AC1_e, "d_a_npc_ac1"},
{fpcNm_NPC_HI1_e, "d_a_npc_hi1"},
{fpcNm_NPC_SV_e, "d_a_npc_sv"},
{fpcNm_NPC_MT_e, "d_a_npc_mt"},
{fpcNm_NPC_MN_e, "d_a_npc_mn"},
{fpcNm_NPC_AH_e, "d_a_npc_ah"},
{fpcNm_AUCTION_e, "d_a_auction"},
{fpcNm_KYTAG00_e, "d_a_kytag00"},
{fpcNm_KYTAG01_e, "d_a_kytag01"},
{fpcNm_KYTAG02_e, "d_a_kytag02"},
{fpcNm_KYTAG03_e, "d_a_kytag03"},
{fpcNm_KYTAG04_e, "d_a_kytag04"},
{fpcNm_KYTAG05_e, "d_a_kytag05"},
{fpcNm_KYTAG06_e, "d_a_kytag06"},
{fpcNm_KYTAG07_e, "d_a_kytag07"},
{fpcNm_WindTag_e, "d_a_wind_tag"},
{fpcNm_YOUGAN_e, "d_a_yougan"},
{fpcNm_Mmusic_e, "d_a_mmusic"},
{fpcNm_Komore_e, "d_a_komore"},
{fpcNm_Tpota_e, "d_a_tpota"},
{fpcNm_Obj_Itnak_e, "d_a_obj_Itnak"},
{fpcNm_Obj_Zouk_e, "d_a_obj_zouK"},
{fpcNm_Ykgr_e, "d_a_ykgr"},
{fpcNm_SAKU_e, "d_a_saku"},
{fpcNm_Salvage_e, "d_a_salvage"},
{fpcNm_SALVAGE_TBOX_e, "d_a_salvage_tbox"},
{fpcNm_Kmon_e, "d_a_kmon"},
{fpcNm_OBJ_FIGURE_e, "d_a_obj_figure"},
{fpcNm_OBJ_HAT_e, "d_a_obj_hat"},
{fpcNm_Lwood_e, "d_a_lwood"},
{fpcNm_Dummy_e, "d_a_dummy"},
{fpcNm_TAG_EVENT_e, "d_a_tag_event"},
{fpcNm_TAG_HINT_e, "d_a_tag_hint"},
{fpcNm_TAG_MSG_e, "d_a_tag_msg"},
{fpcNm_TAG_ETC_e, "d_a_tag_etc"},
{fpcNm_TAG_ISLAND_e, "d_a_tag_island"},
{fpcNm_TAG_KF1_e, "d_a_tag_kf1"},
{fpcNm_TAG_KK1_e, "d_a_tag_kk1"},
{fpcNm_TAG_PHOTO_e, "d_a_tag_photo"},
{fpcNm_TAG_KB_ITEM_e, "d_a_tag_kb_item"},
{fpcNm_TAG_MK_e, "d_a_tag_mk"},
{fpcNm_TAG_MDCB_e, "d_a_tag_md_cb"},
{fpcNm_TAG_BA1_e, "d_a_tag_ba1"},
{fpcNm_TagRock_e, "d_a_fallrock_tag"},
{fpcNm_FallRock_e, "d_a_fallrock"},
{fpcNm_SteamTag_e, "d_a_steam_tag"},
{fpcNm_Fire_e, "d_a_fire"},
{fpcNm_BRANCH_e, "d_a_branch"},
{fpcNm_NPC_ZL1_e, "d_a_npc_zl1"},
{fpcNm_WATERFALL_e, "d_a_waterfall"},
{fpcNm_LIGHTBRIDGE_e, "d_a_lbridge"},
{fpcNm_LIGHTSTAIR_e, "d_a_lstair"},
{fpcNm_WALL_e, "d_a_wall"},
{fpcNm_SW_PROPELLER_e, "d_a_swpropeller"},
{fpcNm_IKARI_e, "d_a_ikari"},
{fpcNm_AGBSW0_e, "d_a_agbsw0"},
{fpcNm_MAGMA_e, "d_a_magma"},
{fpcNm_GRASS_e, "d_a_grass"},
{fpcNm_Obj_Tower_e, "d_a_obj_tower"},
{fpcNm_Obj_DoguuD_e, "d_a_obj_doguu_demo"},
{fpcNm_SPOTBOX_e, "d_a_spotbox"},
{fpcNm_TORNADO_e, "d_a_tornado"},
{fpcNm_TITLE_e, "d_a_title"},
{fpcNm_MP_e, "d_a_movie_player"},
{fpcNm_LODBG_e, "d_a_lod_bg"},
{fpcNm_HIMO3_e, "d_a_himo3"},
{fpcNm_ATT_e, "d_a_att"},
{fpcNm_Hys_e, "d_a_hys"},
{fpcNm_SWHIT0_e, "d_a_swhit0"},
{fpcNm_TAG_GSHIP_e, "d_a_tag_ghostship"},
{fpcNm_TSUBO_e, "d_a_tsubo"},
{fpcNm_STONE_e, "d_a_stone"},
{fpcNm_Stone2_e, "d_a_stone2"},
{fpcNm_Obj_Barrel_e, "d_a_obj_barrel"},
{fpcNm_Obj_Barrel2_e, "d_a_obj_barrel2"},
{fpcNm_Obj_Try_e, "d_a_obj_try"},
{fpcNm_Obj_Vtil_e, "d_a_obj_vtil"},
{fpcNm_Obj_Ice_e, "d_a_obj_ice"},
{fpcNm_Obj_Mshokki_e, "d_a_obj_mshokki"},
{fpcNm_BOKO_e, "d_a_boko"},
{fpcNm_TAMA_e, "d_a_tama"},
{fpcNm_Obj_Buoyflag_e, "d_a_obj_buoyflag"},
{fpcNm_Obj_Correct_e, "d_a_obj_correct"},
{fpcNm_Obj_Eff_e, "d_a_obj_eff"},
{fpcNm_Tag_Light_e, "d_a_tag_light"},
{fpcNm_Tag_Attention_e, "d_a_tag_attention"},
{fpcNm_Tag_Waterlevel_e, "d_a_tag_waterlevel"},
{fpcNm_ARROW_ICEEFF_e, "d_a_arrow_iceeff"},
{fpcNm_ARROW_LIGHTEFF_e, "d_a_arrow_lighteff"},
{fpcNm_Obj_Timer_e, "d_a_obj_timer"},
{0xFFFF, NULL},
};
src/d/actor/d_a_acorn_leaf.cpp
+8 -10
View File
@@ -5,8 +5,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_acorn_leaf.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
#include "d/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
@@ -120,7 +118,7 @@ fpc_ProcID daAleaf_c::create_acorn_sub(bool arg1) {
cXyz sp10;
mDoMtx_stack_c::multVec(&acorn_offset, &sp10);
unk_424 = fopAcM_createChildFromOffset(PROC_TSUBO, fpcM_GetID(this), params, &sp10, fopAcM_GetRoomNo(this), NULL, NULL, -1, NULL);
unk_424 = fopAcM_createChildFromOffset(fpcNm_TSUBO_e, fpcM_GetID(this), params, &sp10, fopAcM_GetRoomNo(this), NULL, NULL, -1, NULL);
unk_41B = false;
unk_41C = false;
@@ -264,18 +262,18 @@ static actor_method_class daAleafMethodTable = {
};
actor_process_profile_definition g_profile_ACORN_LEAF = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_ACORN_LEAF,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_ACORN_LEAF_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daAleaf_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_ACORN_LEAF,
/* Draw Prio */ fpcDwPi_ACORN_LEAF_e,
/* Actor SubMtd */ &daAleafMethodTable,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_agb.cpp
+24 -26
View File
@@ -15,8 +15,6 @@
#include "d/d_com_inf_game.h"
#include "d/d_item_data.h"
#include "d/d_meter.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_kankyo_wether.h"
#include "m_Do/m_Do_controller_pad.h"
#include "m_Do/m_Do_dvd_thread.h"
@@ -742,7 +740,7 @@ void daAgb_c::resetCursor(bool param_0) {
setFollowTarget(false);
setTargetID(fpcM_ERROR_PROCESS_ID_e);
if (fopAcM_GetName(player_p) != PROC_NPC_KAM) {
if (fopAcM_GetName(player_p) != fpcNm_NPC_KAM_e) {
current.pos = player_p->current.pos;
home.pos = player_p->current.pos;
} else {
@@ -932,9 +930,9 @@ void daAgb_c::GbaItemUse() {
fopAc_ac_c* actor_p = fopAcM_SearchByID(getTargetID());
if (cM_rndF(5.0f) < 4.0) {
field_0x640 = dItem_YELLOW_RUPEE_e;
field_0x640 = dItemNo_YELLOW_RUPEE_e;
} else {
field_0x640 = dItem_RED_RUPEE_e;
field_0x640 = dItemNo_RED_RUPEE_e;
}
field_0x634 = actor_p->current.pos;
@@ -942,7 +940,7 @@ void daAgb_c::GbaItemUse() {
temp_r29 = 15;
}
fopAcM_create(PROC_BOMB, daBomb_c::prm_make(daBomb_c::STATE_8, false, false), &current.pos);
fopAcM_create(fpcNm_BOMB_e, daBomb_c::prm_make(daBomb_c::STATE_8, false, false), &current.pos);
field_0x65c = 120;
} else {
temp_r29 = 0xe;
@@ -953,7 +951,7 @@ void daAgb_c::GbaItemUse() {
break;
case 0x15:
resetCursor(false);
fopAcM_create(PROC_BOMB, daBomb_c::prm_make(daBomb_c::STATE_8, false, false), &current.pos);
fopAcM_create(fpcNm_BOMB_e, daBomb_c::prm_make(daBomb_c::STATE_8, false, false), &current.pos);
field_0x65c = 120;
break;
case 0x11:
@@ -1026,16 +1024,16 @@ void daAgb_c::GbaItemUse() {
field_0x65c = 30;
break;
case 7:
if (dComIfGs_checkGetItem(dItem_BAIT_BAG_e)) {
if (dComIfGs_checkGetItem(dItemNo_BAIT_BAG_e)) {
if (dComIfGs_checkBaitItemEmpty()) {
temp_r29 |= 0x1000000;
}
if (dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && dComIfGs_getBombNum() < dComIfGs_getBombMax()) {
if (dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e) && dComIfGs_getBombNum() < dComIfGs_getBombMax()) {
temp_r29 |= 0x10000;
}
if (dComIfGs_getItem(dInvSlot_BOW_e) != dItem_NONE_e && dComIfGs_getArrowNum() < dComIfGs_getArrowMax()) {
if (dComIfGs_getItem(dInvSlot_BOW_e) != dItemNo_NONE_e && dComIfGs_getArrowNum() < dComIfGs_getArrowMax()) {
temp_r29 |= 0x100;
}
}
@@ -1096,7 +1094,7 @@ void daAgb_c::Shopping() {
}
} else {
if (dComIfGs_checkBaitItemEmpty()) {
dComIfGs_setBaitItem(dItem_BIRD_BAIT_5_e);
dComIfGs_setBaitItem(dItemNo_BIRD_BAIT_5_e);
} else {
itemBuy.U8.field_0x1 = 2;
return;
@@ -1219,7 +1217,7 @@ void daAgb_c::FlagsSend(u32 stage_type) {
mFlags.field_0xb_0 = 0;
}
mFlags.field_0x5_2 = field_0x675;
mFlags.field_0x5_1 = dComIfGs_checkGetItem(COTTAGE_PAPER) != FALSE;
mFlags.field_0x5_1 = dComIfGs_checkGetItem(dItemNo_CABANA_DEED_e) != FALSE;
mDoGac_SendDataSet((u32*)&mFlags, 0xC, 9, 0);
}
@@ -1399,7 +1397,7 @@ void daAgb_c::modeMove() {
if (field_0x66b == 0xE) {
if (field_0x65c == 120) {
fopAcM_create(PROC_BOMB, daBomb_c::prm_make(daBomb_c::STATE_8, false, false), &current.pos);
fopAcM_create(fpcNm_BOMB_e, daBomb_c::prm_make(daBomb_c::STATE_8, false, false), &current.pos);
} else if (field_0x65c == 0) {
resetCursor(false);
}
@@ -1473,7 +1471,7 @@ void daAgb_c::modeMove() {
mDoGac_SendDataSet((u32*)&mItemBuy, 4, 0xD, mItemBuy.U32);
}
if ((g_mDoCPd_cpadInfo[mDoGaC_getPortNo()].mGamepadErrorFlags == 0 && fopAcM_GetName(player) != PROC_NPC_KAM) &&
if ((g_mDoCPd_cpadInfo[mDoGaC_getPortNo()].mGamepadErrorFlags == 0 && fopAcM_GetName(player) != fpcNm_NPC_KAM_e) &&
((isActive() && !field_0x675 && CPad_CHECK_TRIG_R(mDoGaC_getPortNo())) ||
(mFlags.field_0x3_5 != 0 && (CPad_CHECK_TRIG_R(mDoGaC_getPortNo()) || CPad_CHECK_TRIG_A(mDoGaC_getPortNo())))))
{
@@ -1487,7 +1485,7 @@ void daAgb_c::modeMove() {
if (attList) {
fopAc_ac_c* r3 = attList->getActor();
if (r3) {
if (fopAcM_CheckStatusMap(r3, 0) && !fopAcM_CheckStatus(r3, fopAcStts_BOSS_e) && fopAcM_GetName(r3) != PROC_FGANON) {
if (fopAcM_CheckStatusMap(r3, 0) && !fopAcM_CheckStatus(r3, fopAcStts_BOSS_e) && fopAcM_GetName(r3) != fpcNm_FGANON_e) {
current.pos = r3->current.pos;
home.pos = r3->current.pos;
setTargetID(attList->getPid());
@@ -1508,7 +1506,7 @@ void daAgb_c::modeMove() {
}
if (getFollowTarget() == 0) {
if (fopAcM_GetName(player) == PROC_NPC_KAM) {
if (fopAcM_GetName(player) == fpcNm_NPC_KAM_e) {
onFree();
} else {
current.pos = player->current.pos;
@@ -1624,9 +1622,9 @@ static BOOL daAgb_Execute(daAgb_c* i_this) {
} else {
daPy_lk_c* player_p2 = daPy_getPlayerLinkActorClass();
if ((dComIfGp_getPlayer(0) == player_p2 && !player->checkPlayerFly()) ||
((fopAcM_GetName(player) == PROC_NPC_MD && !daNpc_Md_c::isFlying()) ||
(fopAcM_GetName(player) == PROC_NPC_CB1 && !daNpc_Cb1_c::isFlying()) ||
fopAcM_GetName(player) == PROC_NPC_OS))
((fopAcM_GetName(player) == fpcNm_NPC_MD_e && !daNpc_Md_c::isFlying()) ||
(fopAcM_GetName(player) == fpcNm_NPC_CB1_e && !daNpc_Cb1_c::isFlying()) ||
fopAcM_GetName(player) == fpcNm_NPC_OS_e))
{
f32 speedF = fabs(player->speedF);
@@ -1824,18 +1822,18 @@ static actor_method_class l_daAgb_Method = {
};
actor_process_profile_definition g_profile_AGB = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_AGB,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_AGB_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daAgb_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_AGB,
/* Draw Prio */ fpcDwPi_AGB_e,
/* Actor SubMtd */ &l_daAgb_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_NOPAUSE_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_agbsw0.cpp
+81 -84
View File
@@ -5,12 +5,9 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "global.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/actor/d_a_agbsw0.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/d_item_data.h"
#include "d/d_map.h"
#include "d/d_kankyo_wether.h"
@@ -93,7 +90,7 @@ BOOL daAgbsw0_c::draw() {
}
}
else if(type == daAgbsw0Type_UNK_0xD_e) {
if(!dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e) || dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D01)) {
if(!dComIfGs_checkGetItem(dItemNo_SKULL_HAMMER_e) || dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D01)) {
return true;
}
}
@@ -787,7 +784,7 @@ BOOL daAgbsw0_c::ExeSubM2() {
return true;
}
else {
if(!dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e)) {
if(!dComIfGs_checkGetItem(dItemNo_SKULL_HAMMER_e)) {
return true;
}
else {
@@ -893,8 +890,8 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb)
if(!dComIfGs_isGetCollectMap(1)) {
return 0x309;
}
if(!dComIfGs_isGetCollectMap(2) && dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e)) {
if(dComIfGs_checkGetItem(COTTAGE_PAPER)) {
if(!dComIfGs_isGetCollectMap(2) && dComIfGs_checkGetItem(dItemNo_SKULL_HAMMER_e)) {
if(dComIfGs_checkGetItem(dItemNo_CABANA_DEED_e)) {
#if VERSION <= VERSION_JPN
s8 roomNo = dComIfGp_roomControl_getStayNo();
#else
@@ -903,13 +900,13 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb)
return roomNo == dIsleRoom_PrivateOasis_e ? 0x30A : 0x30B;
}
else {
u8 num = dComIfGs_checkGetItemNum(dItem_JOY_PENDANT_e);
u8 num = dComIfGs_checkGetItemNum(dItemNo_JOY_PENDANT_e);
return num >= 0x14 ? 0x30C : 0x30D;
}
}
if(!dComIfGs_isGetCollectMap(3)) {
if(dComIfGs_checkGetItem(dItem_BAIT_BAG_e)) {
if(dComIfGs_checkBaitItem(dItem_HYOI_PEAR_e)) {
if(dComIfGs_checkGetItem(dItemNo_BAIT_BAG_e)) {
if(dComIfGs_checkBaitItem(dItemNo_HYOI_PEAR_e)) {
#if VERSION <= VERSION_JPN
s8 roomNo = dComIfGp_roomControl_getStayNo();
#else
@@ -924,7 +921,7 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb)
return 0x30E;
}
if(!dComIfGs_isGetCollectMap(4) && dComIfGs_checkGetItem(dItem_HOOKSHOT_e)) {
if(!dComIfGs_isGetCollectMap(4) && dComIfGs_checkGetItem(dItemNo_HOOKSHOT_e)) {
if(dComIfGs_isOpenCollectMap(0x24)) {
s32 hour = dKy_getdaytime_hour();
if(hour < 6 || hour >= 0x13) {
@@ -1018,7 +1015,7 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb)
}
}
if(!dComIfGs_isCollect(2, 0)) {
if(dComIfGs_checkGetItem(dItem_MAGIC_ARROW_e)) {
if(dComIfGs_checkGetItem(dItemNo_MAGIC_ARROW_e)) {
return 0x328;
}
else {
@@ -1042,7 +1039,7 @@ u32 daAgbsw0_c::TriforceCheck(daAgb_c* agb)
#endif
return roomNo == dIsleRoom_StoneWatcherIsland_e ? 0x327 : 0x326;
}
if(dComIfGs_checkGetItem(dItem_HOOKSHOT_e)) {
if(dComIfGs_checkGetItem(dItemNo_HOOKSHOT_e)) {
#if VERSION <= VERSION_JPN
s8 roomNo = dComIfGp_roomControl_getStayNo();
#else
@@ -1152,7 +1149,7 @@ BOOL daAgbsw0_c::ExeSubT() {
else {
if(mDoGaC_GbaLink()) {
if(mDoGac_SendStatusCheck(0xF)) {
if(mCyl.ChkTgHit() && mCyl.GetTgHitAc() && fopAcM_GetName(mCyl.GetTgHitAc()) == PROC_BOMB && ((daBomb_c*)mCyl.GetTgHitAc())->chk_state(daBomb_c::STATE_8)) {
if(mCyl.ChkTgHit() && mCyl.GetTgHitAc() && fopAcM_GetName(mCyl.GetTgHitAc()) == fpcNm_BOMB_e && ((daBomb_c*)mCyl.GetTgHitAc())->chk_state(daBomb_c::STATE_8)) {
mSE = BigLittleChange(0x12);
mDoGac_SendDataSet(&mSE, 4, 0xF, 0);
fopAcM_onSwitch(this, sw0);
@@ -1248,11 +1245,11 @@ BOOL daAgbsw0_c::ExeSubR() {
if(mDoGaC_GbaLink() && mDoGac_SendStatusCheck(5)) {
if(sw0 != 0xFF && fopAcM_isSwitch(this, sw0)) {
s32 itemNo = getParamNo();
if(itemNo < 0 || dItem_TRIPLE_HEART_e < itemNo) {
if(itemNo < 0 || dItemNo_TRIPLE_HEART_e < itemNo) {
itemNo = 0;
}
if(itemNo != dItem_RECOVER_FAIRY_e) {
if(itemNo != dItemNo_RECOVER_FAIRY_e) {
current.pos.y += scale.y / 2.0f;
}
@@ -1517,10 +1514,10 @@ BOOL daAgbsw0_c::ExeSubD() {
}
else if(field_0x299 == 2 && fopAcM_isSwitch(this, getSw1())) {
s32 itemNo = getParamNo();
if(itemNo != dItem_RECOVER_FAIRY_e) {
if(itemNo != dItemNo_RECOVER_FAIRY_e) {
current.pos.y += scale.y / 2;
}
if(0 <= itemNo && itemNo < 0x1F && itemNo != dItem_HEART_PIECE_e && itemNo != dItem_HEART_CONTAINER_e && itemNo != dItem_SMALL_KEY_e) {
if(0 <= itemNo && itemNo < 0x1F && itemNo != dItemNo_HEART_PIECE_e && itemNo != dItemNo_HEART_CONTAINER_e && itemNo != dItemNo_SMALL_KEY_e) {
s8 roomNo = fopAcM_GetHomeRoomNo(this);
f32 rnd = cM_rndF(10.0f) + 40.0f;
fopAcM_fastCreateItem(&current.pos, itemNo, roomNo, NULL, NULL, 0.0f, rnd, -7.0f);
@@ -1785,9 +1782,9 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) {
break;
case 0x11:
if(
dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_BOW_e &&
dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_BOW_e &&
dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_BOW_e
dComIfGp_getSelectItem(dItemBtn_X_e) != dItemNo_BOW_e &&
dComIfGp_getSelectItem(dItemBtn_Y_e) != dItemNo_BOW_e &&
dComIfGp_getSelectItem(dItemBtn_Z_e) != dItemNo_BOW_e
) {
return FALSE;
}
@@ -1795,9 +1792,9 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) {
break;
case 0x12:
if(
dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_BOOMERANG_e &&
dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_BOOMERANG_e &&
dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_BOOMERANG_e
dComIfGp_getSelectItem(dItemBtn_X_e) != dItemNo_BOOMERANG_e &&
dComIfGp_getSelectItem(dItemBtn_Y_e) != dItemNo_BOOMERANG_e &&
dComIfGp_getSelectItem(dItemBtn_Z_e) != dItemNo_BOOMERANG_e
) {
return FALSE;
}
@@ -1805,9 +1802,9 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) {
break;
case 0x13:
if(
dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_DEKU_LEAF_e &&
dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_DEKU_LEAF_e &&
dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_DEKU_LEAF_e
dComIfGp_getSelectItem(dItemBtn_X_e) != dItemNo_DEKU_LEAF_e &&
dComIfGp_getSelectItem(dItemBtn_Y_e) != dItemNo_DEKU_LEAF_e &&
dComIfGp_getSelectItem(dItemBtn_Z_e) != dItemNo_DEKU_LEAF_e
) {
return FALSE;
}
@@ -1815,9 +1812,9 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) {
break;
case 0x14:
if(
dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_GRAPPLING_HOOK_e &&
dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_GRAPPLING_HOOK_e &&
dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_GRAPPLING_HOOK_e
dComIfGp_getSelectItem(dItemBtn_X_e) != dItemNo_GRAPPLING_HOOK_e &&
dComIfGp_getSelectItem(dItemBtn_Y_e) != dItemNo_GRAPPLING_HOOK_e &&
dComIfGp_getSelectItem(dItemBtn_Z_e) != dItemNo_GRAPPLING_HOOK_e
) {
return FALSE;
}
@@ -1825,9 +1822,9 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) {
break;
case 0x15:
if(
dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_BOMB_BAG_e &&
dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_BOMB_BAG_e &&
dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_BOMB_BAG_e
dComIfGp_getSelectItem(dItemBtn_X_e) != dItemNo_BOMB_BAG_e &&
dComIfGp_getSelectItem(dItemBtn_Y_e) != dItemNo_BOMB_BAG_e &&
dComIfGp_getSelectItem(dItemBtn_Z_e) != dItemNo_BOMB_BAG_e
) {
return FALSE;
}
@@ -1835,16 +1832,16 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) {
break;
case 0x16:
if(
dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_HOOKSHOT_e &&
dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_HOOKSHOT_e &&
dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_HOOKSHOT_e
dComIfGp_getSelectItem(dItemBtn_X_e) != dItemNo_HOOKSHOT_e &&
dComIfGp_getSelectItem(dItemBtn_Y_e) != dItemNo_HOOKSHOT_e &&
dComIfGp_getSelectItem(dItemBtn_Z_e) != dItemNo_HOOKSHOT_e
) {
return FALSE;
}
break;
case 0x17:
if(dComIfGs_checkGetItem(dItem_MAGIC_ARMOR_e)) {
if(dComIfGs_checkGetItem(dItemNo_MAGIC_ARMOR_e)) {
return FALSE;
}
@@ -1862,13 +1859,13 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) {
break;
case 0x1A:
if(dComIfGs_getItem(dInvSlot_BOW_e) != dItem_NONE_e && dComIfGs_getArrowNum() < dComIfGs_getArrowMax()) {
if(dComIfGs_getItem(dInvSlot_BOW_e) != dItemNo_NONE_e && dComIfGs_getArrowNum() < dComIfGs_getArrowMax()) {
return FALSE;
}
break;
case 0x1B:
if(dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && dComIfGs_getBombNum() < dComIfGs_getBombMax()) {
if(dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e) && dComIfGs_getBombNum() < dComIfGs_getBombMax()) {
return FALSE;
}
@@ -1887,25 +1884,25 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) {
break;
case 0x1E:
if(dComIfGs_getItem(dInvSlot_BOW_e) != dItem_NONE_e && dComIfGs_getArrowNum() == 0) {
if(dComIfGs_getItem(dInvSlot_BOW_e) != dItemNo_NONE_e && dComIfGs_getArrowNum() == 0) {
return FALSE;
}
break;
case 0x1F:
if(dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && dComIfGs_getBombNum() == 0) {
if(dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e) && dComIfGs_getBombNum() == 0) {
return FALSE;
}
break;
case 0x20:
if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1708) && dComIfGs_getItem(dInvSlot_BOW_e) != dItem_NONE_e && dComIfGs_getArrowNum() == 0) {
if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1708) && dComIfGs_getItem(dInvSlot_BOW_e) != dItemNo_NONE_e && dComIfGs_getArrowNum() == 0) {
return FALSE;
}
break;
case 0x21:
if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1708) && dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && dComIfGs_getBombNum() == 0) {
if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_1708) && dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e) && dComIfGs_getBombNum() == 0) {
return FALSE;
}
@@ -1930,9 +1927,9 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) {
break;
case 0x25:
if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) &&
dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_BOMB_BAG_e &&
dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_BOMB_BAG_e &&
dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_BOMB_BAG_e)
dComIfGp_getSelectItem(dItemBtn_X_e) != dItemNo_BOMB_BAG_e &&
dComIfGp_getSelectItem(dItemBtn_Y_e) != dItemNo_BOMB_BAG_e &&
dComIfGp_getSelectItem(dItemBtn_Z_e) != dItemNo_BOMB_BAG_e)
{
return FALSE;
}
@@ -1940,9 +1937,9 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) {
break;
case 0x26:
if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) &&
dComIfGp_getSelectItem(dItemBtn_X_e) != dItem_GRAPPLING_HOOK_e &&
dComIfGp_getSelectItem(dItemBtn_Y_e) != dItem_GRAPPLING_HOOK_e &&
dComIfGp_getSelectItem(dItemBtn_Z_e) != dItem_GRAPPLING_HOOK_e)
dComIfGp_getSelectItem(dItemBtn_X_e) != dItemNo_GRAPPLING_HOOK_e &&
dComIfGp_getSelectItem(dItemBtn_Y_e) != dItemNo_GRAPPLING_HOOK_e &&
dComIfGp_getSelectItem(dItemBtn_Z_e) != dItemNo_GRAPPLING_HOOK_e)
{
return FALSE;
}
@@ -1961,25 +1958,25 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) {
break;
case 0x29:
if(dComIfGs_checkGetItem(dItem_GRAPPLING_HOOK_e)) {
if(dComIfGs_checkGetItem(dItemNo_GRAPPLING_HOOK_e)) {
return FALSE;
}
break;
case 0x2A:
if(dComIfGs_checkGetItem(dItem_BOOMERANG_e)) {
if(dComIfGs_checkGetItem(dItemNo_BOOMERANG_e)) {
return FALSE;
}
break;
case 0x2B:
if(dComIfGs_checkGetItem(dItem_BOMB_BAG_e)) {
if(dComIfGs_checkGetItem(dItemNo_BOMB_BAG_e)) {
return FALSE;
}
break;
case 0x2C:
if(dComIfGs_getItem(dInvSlot_BOW_e) != dItem_NONE_e) {
if(dComIfGs_getItem(dInvSlot_BOW_e) != dItemNo_NONE_e) {
return FALSE;
}
@@ -2127,73 +2124,73 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) {
return FALSE;
case 0x44:
if(fopAcM_GetName(dComIfGp_getPlayer(0)) == PROC_NPC_OS) {
if(fopAcM_GetName(dComIfGp_getPlayer(0)) == fpcNm_NPC_OS_e) {
return FALSE;
}
break;
case 0x45:
if(fopAcM_GetName(dComIfGp_getPlayer(0)) != PROC_NPC_OS) {
if(fopAcM_GetName(dComIfGp_getPlayer(0)) != fpcNm_NPC_OS_e) {
return FALSE;
}
break;
case 0x46:
if(fopAcM_GetName(dComIfGp_getPlayer(0)) == PROC_NPC_MD) {
if(fopAcM_GetName(dComIfGp_getPlayer(0)) == fpcNm_NPC_MD_e) {
return FALSE;
}
break;
case 0x47:
if(fopAcM_GetName(dComIfGp_getPlayer(0)) != PROC_NPC_MD) {
if(fopAcM_GetName(dComIfGp_getPlayer(0)) != fpcNm_NPC_MD_e) {
return FALSE;
}
break;
case 0x48:
if(fopAcM_GetName(dComIfGp_getPlayer(0)) == PROC_NPC_CB1) {
if(fopAcM_GetName(dComIfGp_getPlayer(0)) == fpcNm_NPC_CB1_e) {
return FALSE;
}
break;
case 0x49:
if(fopAcM_GetName(dComIfGp_getPlayer(0)) != PROC_NPC_CB1) {
if(fopAcM_GetName(dComIfGp_getPlayer(0)) != fpcNm_NPC_CB1_e) {
return FALSE;
}
break;
case 0x4A:
if(fopAcM_GetName(dComIfGp_getPlayer(0)) == PROC_NPC_KAM) {
if(fopAcM_GetName(dComIfGp_getPlayer(0)) == fpcNm_NPC_KAM_e) {
return FALSE;
}
break;
case 0x4B:
if(fopAcM_GetName(dComIfGp_getPlayer(0)) != PROC_NPC_KAM) {
if(fopAcM_GetName(dComIfGp_getPlayer(0)) != fpcNm_NPC_KAM_e) {
return FALSE;
}
break;
case 0x4C:
if(dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e)) {
if(dComIfGs_checkGetItem(dItemNo_SKULL_HAMMER_e)) {
return FALSE;
}
break;
case 0x4D:
if(!dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e)) {
if(!dComIfGs_checkGetItem(dItemNo_SKULL_HAMMER_e)) {
return FALSE;
}
break;
case 0x4E:
if(dComIfGs_checkGetItem(dItem_MIRROR_SHIELD_e)) {
if(dComIfGs_checkGetItem(dItemNo_MIRROR_SHIELD_e)) {
return FALSE;
}
break;
case 0x4F:
if(!dComIfGs_checkGetItem(dItem_MIRROR_SHIELD_e)) {
if(!dComIfGs_checkGetItem(dItemNo_MIRROR_SHIELD_e)) {
return FALSE;
}
@@ -2211,13 +2208,13 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) {
break;
case 0x52:
if(dComIfGs_checkGetItem(dItem_HOOKSHOT_e)) {
if(dComIfGs_checkGetItem(dItemNo_HOOKSHOT_e)) {
return FALSE;
}
break;
case 0x53:
if(!dComIfGs_checkGetItem(dItem_HOOKSHOT_e)) {
if(!dComIfGs_checkGetItem(dItemNo_HOOKSHOT_e)) {
return FALSE;
}
@@ -2247,31 +2244,31 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) {
break;
case 0x58:
if(!dComIfGs_checkGetItem(dItem_IRON_BOOTS_e)) {
if(!dComIfGs_checkGetItem(dItemNo_IRON_BOOTS_e)) {
return FALSE;
}
break;
case 0x59:
if(dComIfGs_checkGetItem(dItem_MASTER_SWORD_2_e) || dComIfGs_checkGetItem(dItem_MASTER_SWORD_3_e)) {
if(dComIfGs_checkGetItem(dItemNo_MASTER_SWORD_2_e) || dComIfGs_checkGetItem(dItemNo_MASTER_SWORD_3_e)) {
return FALSE;
}
break;
case 0x5A:
if(!dComIfGs_checkGetItem(dItem_MASTER_SWORD_2_e) && !dComIfGs_checkGetItem(dItem_MASTER_SWORD_3_e)) {
if(!dComIfGs_checkGetItem(dItemNo_MASTER_SWORD_2_e) && !dComIfGs_checkGetItem(dItemNo_MASTER_SWORD_3_e)) {
return FALSE;
}
break;
case 0x5B:
if(dComIfGs_checkGetItem(dItem_MASTER_SWORD_3_e)) {
if(dComIfGs_checkGetItem(dItemNo_MASTER_SWORD_3_e)) {
return FALSE;
}
break;
case 0x5C:
if(!dComIfGs_checkGetItem(dItem_MASTER_SWORD_3_e)) {
if(!dComIfGs_checkGetItem(dItemNo_MASTER_SWORD_3_e)) {
return FALSE;
}
@@ -2465,27 +2462,27 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) {
break;
case 0x7B:
if(fopAcM_GetName(dComIfGp_getPlayer(0)) == PROC_NPC_MD && daNpc_Md_c::isFlying()) {
if(fopAcM_GetName(dComIfGp_getPlayer(0)) == fpcNm_NPC_MD_e && daNpc_Md_c::isFlying()) {
return FALSE;
}
break;
case 0x7C:
if(fopAcM_GetName(dComIfGp_getPlayer(0)) != PROC_NPC_MD || !daNpc_Md_c::isFlying()) {
if(fopAcM_GetName(dComIfGp_getPlayer(0)) != fpcNm_NPC_MD_e || !daNpc_Md_c::isFlying()) {
return FALSE;
}
break;
case 0x7F:
// Potential bug: This seems to check if the current player is Medli, but that Makar is flying?
if(fopAcM_GetName(dComIfGp_getPlayer(0)) == PROC_NPC_MD && daNpc_Cb1_c::isFlying()) {
if(fopAcM_GetName(dComIfGp_getPlayer(0)) == fpcNm_NPC_MD_e && daNpc_Cb1_c::isFlying()) {
return FALSE;
}
break;
case 0x80:
// Potential bug: This seems to check if the current player is Medli, but that Makar is flying?
if(fopAcM_GetName(dComIfGp_getPlayer(0)) != PROC_NPC_MD || !daNpc_Cb1_c::isFlying()) {
if(fopAcM_GetName(dComIfGp_getPlayer(0)) != fpcNm_NPC_MD_e || !daNpc_Cb1_c::isFlying()) {
return FALSE;
}
@@ -2497,7 +2494,7 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) {
break;
case 0x7E:
if(dComIfGs_checkGetItem(dItem_SKULL_HAMMER_e) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D01)) {
if(dComIfGs_checkGetItem(dItemNo_SKULL_HAMMER_e) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D01)) {
return FALSE;
}
@@ -2586,18 +2583,18 @@ static actor_method_class l_daAgbsw0_Method = {
};
actor_process_profile_definition g_profile_AGBSW0 = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_AGBSW0,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_AGBSW0_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daAgbsw0_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_AGBSW0,
/* Draw Prio */ fpcDwPi_AGBSW0_e,
/* Actor SubMtd */ &l_daAgbsw0_Method,
/* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_alldie.cpp
+7 -9
View File
@@ -6,8 +6,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_alldie.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "f_op/f_op_actor_mng.h"
enum {
@@ -119,18 +117,18 @@ static actor_method_class l_daAlldie_Method = {
};
actor_process_profile_definition g_profile_ALLDIE = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0002,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_ALLDIE,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0002,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_ALLDIE_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daAlldie_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_ALLDIE,
/* Draw Prio */ fpcDwPi_ALLDIE_e,
/* Actor SubMtd */ &l_daAlldie_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_6_e,
/* Cull Type */ fopAc_CULLBOX_6_e,
};
src/d/actor/d_a_am.cpp
+14 -16
View File
@@ -9,8 +9,6 @@
#include "f_op/f_op_actor_mng.h"
#include "JSystem/J3DGraphAnimator/J3DNode.h"
#include "SSystem/SComponent/c_xyz.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
#include "d/d_bg_s_acch.h"
#include "d/d_bg_s_lin_chk.h"
@@ -348,7 +346,7 @@ static void bomb_move_set(am_class* i_this, u8 alwaysMoveY) {
swallowedActor->current.angle.y = actor->shape_angle.y;
swallowedActor->shape_angle.y = actor->shape_angle.y;
if (fpcM_GetName(swallowedActor) == PROC_BOMB) {
if (fpcM_GetName(swallowedActor) == fpcNm_BOMB_e) {
daBomb_c* bomb = (daBomb_c*)swallowedActor;
if (i_this->mCountDownTimers[1] == 1) {
bomb->scale.setall(0.0f);
@@ -357,7 +355,7 @@ static void bomb_move_set(am_class* i_this, u8 alwaysMoveY) {
bomb->scale.setall(1.0f);
}
bomb->setBombRestTime(100);
} else if (fpcM_GetName(swallowedActor) == PROC_Bomb2) {
} else if (fpcM_GetName(swallowedActor) == fpcNm_Bomb2_e) {
daBomb2::Act_c* bomb2 = (daBomb2::Act_c*)swallowedActor;
if (i_this->mCountDownTimers[1] == 1) {
bomb2->scale.setall(0.0f);
@@ -392,7 +390,7 @@ static BOOL bomb_nomi_check(am_class* i_this) {
if (hitObj) {
fopAc_ac_c* hitActor = hitObj->GetAc();
if (hitActor) {
if (fpcM_GetName(hitActor) == PROC_BOMB) {
if (fpcM_GetName(hitActor) == fpcNm_BOMB_e) {
daBomb_c* bomb = (daBomb_c*)hitActor;
if (!bomb->getBombCheck_Flag() && bomb->getBombRestTime() > 1) {
if (i_this->mMouthPos.y - (20.0f + REG8_F(1)) < bomb->current.pos.y) {
@@ -407,7 +405,7 @@ static BOOL bomb_nomi_check(am_class* i_this) {
return TRUE;
}
}
} else if (fpcM_GetName(hitActor) == PROC_Bomb2) {
} else if (fpcM_GetName(hitActor) == fpcNm_Bomb2_e) {
daBomb2::Act_c* bomb2 = (daBomb2::Act_c*)hitActor;
if (!bomb2->chk_eat() && bomb2->get_time() > 1) {
if (i_this->mMouthPos.y - (20.0f + REG8_F(1)) < bomb2->current.pos.y) {
@@ -938,10 +936,10 @@ static void action_itai_move(am_class* i_this) {
fopAc_ac_c* swallowedActor = fopAcM_SearchByID(i_this->mSwallowedActorPID);
if (swallowedActor) {
swallowedActor->scale.setall(1.0f);
if (fpcM_GetName(swallowedActor) == PROC_BOMB) {
if (fpcM_GetName(swallowedActor) == fpcNm_BOMB_e) {
daBomb_c* bomb = (daBomb_c*)swallowedActor;
bomb->setBombRestTime(1);
} else if (fpcM_GetName(swallowedActor) == PROC_Bomb2) {
} else if (fpcM_GetName(swallowedActor) == fpcNm_Bomb2_e) {
daBomb2::Act_c* bomb2 = (daBomb2::Act_c*)swallowedActor;
bomb2->set_time(1);
}
@@ -973,7 +971,7 @@ static void action_itai_move(am_class* i_this) {
static BOOL daAM_Execute(am_class* i_this) {
fopAc_ac_c* actor = &i_this->actor;
fopAcM_setGbaName(actor, dItem_BOW_e, 0xC, 0x2A);
fopAcM_setGbaName(actor, dItemNo_BOW_e, 0xC, 0x2A);
if (enemy_ice(&i_this->mEnemyIce)) {
J3DModel* model = i_this->mpMorf->getModel();
@@ -1382,18 +1380,18 @@ static actor_method_class l_daAM_Method = {
};
actor_process_profile_definition g_profile_AM = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_AM,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_AM_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(am_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_AM,
/* Draw Prio */ fpcDwPi_AM_e,
/* Actor SubMtd */ &l_daAM_Method,
/* Status */ fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_am2.cpp
+8 -10
View File
@@ -7,8 +7,6 @@
#include "d/actor/d_a_am2.h"
#include "d/res/res_am2.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_bg_s_lin_chk.h"
#include "d/d_s_play.h"
#include "d/d_com_inf_game.h"
@@ -1101,7 +1099,7 @@ static BOOL daAM2_Execute(am2_class* i_this) {
}
}
fopAcM_setGbaName(actor, dItem_BOW_e, 0xB, 0x29);
fopAcM_setGbaName(actor, dItemNo_BOW_e, 0xB, 0x29);
if (enemy_ice(&i_this->mEnemyIce)) {
i_this->mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -1496,18 +1494,18 @@ static actor_method_class l_daAM2_Method = {
};
actor_process_profile_definition g_profile_AM2 = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_AM2,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_AM2_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(am2_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_AM2,
/* Draw Prio */ fpcDwPi_AM2_e,
/* Actor SubMtd */ &l_daAM2_Method,
/* Status */ fopAcStts_CULL_e | fopAcStts_FREEZE_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_amiprop.cpp
+7 -9
View File
@@ -5,8 +5,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_amiprop.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
#include "d/d_com_inf_game.h"
#include "d/d_bg_s_movebg_actor.h"
@@ -230,18 +228,18 @@ static actor_method_class daAmiPropMethodTable = {
};
actor_process_profile_definition g_profile_AMI_PROP = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0003,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_AMI_PROP,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0003,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_AMI_PROP_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daAmiProp_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_AMI_PROP,
/* Draw Prio */ fpcDwPi_AMI_PROP_e,
/* Actor SubMtd */ &daAmiPropMethodTable,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_andsw0.cpp
+11 -13
View File
@@ -7,8 +7,6 @@
#include "d/actor/d_a_andsw0.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/actor/d_a_bk.h"
#include "d/actor/d_a_bb.h"
@@ -145,7 +143,7 @@ static s32 check_count;
/* 000003C4-0000044C .text bk_s_sub1__FPvPv */
static void* bk_s_sub1(void* i_this, void*) {
if(fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_BK && (fopAcM_GetParam(i_this) & 0xF) == 7) {
if(fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_BK_e && (fopAcM_GetParam(i_this) & 0xF) == 7) {
s32 count = check_count; //regswaps without this
if(count < 2) {
ac[check_count] = i_this;
@@ -160,7 +158,7 @@ static void* bk_s_sub1(void* i_this, void*) {
/* 0000044C-000004D4 .text bk_s_sub2__FPvPv */
static void* bk_s_sub2(void* i_this, void*) {
if(fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_BK && (fopAcM_GetParam(i_this) & 0xF) == 4) {
if(fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_BK_e && (fopAcM_GetParam(i_this) & 0xF) == 4) {
s32 count = check_count; //regswaps without this
if(count == 2) {
ac[check_count] = i_this;
@@ -175,7 +173,7 @@ static void* bk_s_sub2(void* i_this, void*) {
/* 000004D4-0000055C .text bk_s_sub3__FPvPv */
static void* bk_s_sub3(void* i_this, void*) {
if(fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_BK && (fopAcM_GetParam(i_this) & 0xF) == 5) {
if(fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_BK_e && (fopAcM_GetParam(i_this) & 0xF) == 5) {
s32 count = check_count; //regswaps without this
if(count < 5) {
ac[check_count] = i_this;
@@ -190,7 +188,7 @@ static void* bk_s_sub3(void* i_this, void*) {
/* 0000055C-000005D4 .text bb_s_sub__FPvPv */
static void* bb_s_sub(void* search, void*) {
if(fopAcM_IsActor(search) && fopAcM_GetName(search) == PROC_BB) {
if(fopAcM_IsActor(search) && fopAcM_GetName(search) == fpcNm_BB_e) {
s32 count = check_count; //regswaps without this
if(count < 7) {
ac[check_count] = search;
@@ -349,18 +347,18 @@ static actor_method_class l_daAndsw0_Method = {
};
actor_process_profile_definition g_profile_ANDSW0 = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_ANDSW0,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_ANDSW0_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(andsw0_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_ANDSW0,
/* Draw Prio */ fpcDwPi_ANDSW0_e,
/* Actor SubMtd */ &l_daAndsw0_Method,
/* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_andsw2.cpp
+7 -9
View File
@@ -7,8 +7,6 @@
#include "d/actor/d_a_andsw2.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
enum Action {
ACT_ON_ALL,
@@ -256,18 +254,18 @@ static actor_method_class l_daAndsw2_Method = {
};
actor_process_profile_definition g_profile_ANDSW2 = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_ANDSW2,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_ANDSW2_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daAndsw2_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_ANDSW2,
/* Draw Prio */ fpcDwPi_ANDSW2_e,
/* Actor SubMtd */ &l_daAndsw2_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_6_e,
/* Cull Type */ fopAc_CULLBOX_6_e,
};
src/d/actor/d_a_arrow.cpp
+25 -27
View File
@@ -7,8 +7,6 @@
#include "d/actor/d_a_arrow.h"
#include "m_Do/m_Do_mtx.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_item_data.h"
#include "d/actor/d_a_player.h"
#include "d/actor/d_a_player_main.h"
@@ -142,7 +140,7 @@ void daArrow_c::checkCreater() {
// Check if this arrow was fired by Princess Zelda (during the Ganondorf fight).
fopAc_ac_c* archer;
if (fopAcM_SearchByID(fopAcM_GetLinkId(this), &archer)) {
if (fpcM_GetName(archer) == PROC_PZ) {
if (fpcM_GetName(archer) == fpcNm_PZ_e) {
mbSetByZelda = true;
}
}
@@ -156,7 +154,7 @@ void daArrow_c::setLightEffect() {
}
if (!mbHasLightEff) {
mLightEffPID = fopAcM_createChild(
PROC_ARROW_LIGHTEFF, fopAcM_GetID(this),
fpcNm_ARROW_LIGHTEFF_e, fopAcM_GetID(this),
mArrowType, &field_0x6a8,
current.roomNo, &shape_angle
);
@@ -326,7 +324,7 @@ void daArrow_c::ShieldReflect() {
s16 targetAngleX = link->getBodyAngleX();
fopAc_ac_c* ganondorf;
if (fopAcM_SearchByName(PROC_GND, &ganondorf)) {
if (fopAcM_SearchByName(fpcNm_GND_e, &ganondorf)) {
dAttention_c& attention = dComIfGp_getAttention();
if (attention.LockonTruth() && attention.LockonTarget(0) == ganondorf) {
cXyz ganondorfChestPos = ganondorf->current.pos;
@@ -393,7 +391,7 @@ bool daArrow_c::check_water_in() {
} else if (mArrowType == TYPE_ICE) {
mInWaterTimer = 10*30;
fopAcM_createChild(
PROC_ARROW_ICEEFF, fopAcM_GetID(this), mArrowType,
fpcNm_ARROW_ICEEFF_e, fopAcM_GetID(this), mArrowType,
&waterHitPos, current.roomNo, &current.angle
);
#if VERSION > VERSION_DEMO
@@ -438,19 +436,19 @@ daArrow_c* daArrow_c::changeArrowType() {
daArrow_c* ret = this;
if (mArrowType == TYPE_NORMAL) {
if (dComIfGs_getMagic() < 1 || !(dComIfGs_getItem(dInvSlot_BOW_e) == dItem_MAGIC_ARROW_e || dComIfGs_getItem(dInvSlot_BOW_e) == dItem_LIGHT_ARROW_e)) {
if (dComIfGs_getMagic() < 1 || !(dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_MAGIC_ARROW_e || dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_LIGHT_ARROW_e)) {
mArrowType = TYPE_NORMAL;
} else {
mArrowType = TYPE_FIRE;
}
} else if (mArrowType == TYPE_FIRE) {
if (dComIfGs_getMagic() < 1 || !(dComIfGs_getItem(dInvSlot_BOW_e) == dItem_MAGIC_ARROW_e || dComIfGs_getItem(dInvSlot_BOW_e) == dItem_LIGHT_ARROW_e)) {
if (dComIfGs_getMagic() < 1 || !(dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_MAGIC_ARROW_e || dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_LIGHT_ARROW_e)) {
mArrowType = TYPE_NORMAL;
} else {
mArrowType = TYPE_ICE;
}
} else if (mArrowType == TYPE_ICE) {
if (dComIfGs_getMagic() < 2 || dComIfGs_getItem(dInvSlot_BOW_e) != dItem_LIGHT_ARROW_e) {
if (dComIfGs_getMagic() < 2 || dComIfGs_getItem(dInvSlot_BOW_e) != dItemNo_LIGHT_ARROW_e) {
mArrowType = TYPE_NORMAL;
} else {
mArrowType = TYPE_LIGHT;
@@ -461,7 +459,7 @@ daArrow_c* daArrow_c::changeArrowType() {
if (mArrowType != origArrowType) {
m_keep_type = mArrowType;
daArrow_c* newNockedArrow = (daArrow_c*)fopAcM_fastCreate(PROC_ARROW, 0, &current.pos, fopAcM_GetRoomNo(this));
daArrow_c* newNockedArrow = (daArrow_c*)fopAcM_fastCreate(fpcNm_ARROW_e, 0, &current.pos, fopAcM_GetRoomNo(this));
if (!newNockedArrow) {
mArrowType = origArrowType;
m_keep_type = origArrowType;
@@ -483,18 +481,18 @@ void daArrow_c::changeArrowTypeNotReady() {
if (dComIfGs_getMagic() < 1) {
return;
}
if (dComIfGs_getItem(dInvSlot_BOW_e) == dItem_MAGIC_ARROW_e || dComIfGs_getItem(dInvSlot_BOW_e) == dItem_LIGHT_ARROW_e) {
if (dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_MAGIC_ARROW_e || dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_LIGHT_ARROW_e) {
m_keep_type = TYPE_FIRE;
}
} else if (m_keep_type == TYPE_FIRE) {
if (dComIfGs_getMagic() < 1) {
return;
}
if (dComIfGs_getItem(dInvSlot_BOW_e) == dItem_MAGIC_ARROW_e || dComIfGs_getItem(dInvSlot_BOW_e) == dItem_LIGHT_ARROW_e) {
if (dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_MAGIC_ARROW_e || dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_LIGHT_ARROW_e) {
m_keep_type = TYPE_ICE;
}
} else if (m_keep_type == TYPE_ICE) {
if (dComIfGs_getMagic() >= 2 && dComIfGs_getItem(dInvSlot_BOW_e) == dItem_LIGHT_ARROW_e) {
if (dComIfGs_getMagic() >= 2 && dComIfGs_getItem(dInvSlot_BOW_e) == dItemNo_LIGHT_ARROW_e) {
m_keep_type = TYPE_LIGHT;
} else {
m_keep_type = TYPE_NORMAL;
@@ -630,7 +628,7 @@ BOOL daArrow_c::procMove() {
cXyz temp12;
cXyz hitPos;
csXyz temp11;
if (mArrowType == TYPE_LIGHT && !mbLinkReflect && mAtCps.ChkAtShieldHit() && fpcM_GetName(mAtCps.GetAtHitAc()) == PROC_PLAYER) {
if (mArrowType == TYPE_LIGHT && !mbLinkReflect && mAtCps.ChkAtShieldHit() && fpcM_GetName(mAtCps.GetAtHitAc()) == fpcNm_PLAYER_e) {
mAtCps.GetAtHitAc();
hitPos = *mAtCps.GetAtHitPosP();
hitType = -1; // Reflected hit
@@ -653,9 +651,9 @@ BOOL daArrow_c::procMove() {
if (hitActor) {
JntHit_c* jntHit = fopAcM_GetJntHit(hitActor);
if (mArrowType == TYPE_LIGHT) {
if (fpcM_GetName(mAtCps.GetAtHitAc()) == PROC_BGN ||
fpcM_GetName(mAtCps.GetAtHitAc()) == PROC_BGN2 ||
fpcM_GetName(mAtCps.GetAtHitAc()) == PROC_BGN3) {
if (fpcM_GetName(mAtCps.GetAtHitAc()) == fpcNm_BGN_e ||
fpcM_GetName(mAtCps.GetAtHitAc()) == fpcNm_BGN2_e ||
fpcM_GetName(mAtCps.GetAtHitAc()) == fpcNm_BGN3_e) {
// Hit Puppet Ganon.
if (hitWasBlocked) {
field_0x6a8 = hitPos;
@@ -794,12 +792,12 @@ BOOL daArrow_c::procMove() {
field_0x698 = false;
} else if (mArrowType == TYPE_ICE) {
if (dComIfG_Bgsp()->ChkGrpInf(mLinChk, 0x200)) {
fopAcM_create(PROC_Obj_Magmarock, NULL, &field_0x6a8, current.roomNo);
fopAcM_create(fpcNm_Obj_Magmarock_e, NULL, &field_0x6a8, current.roomNo);
} else {
dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWI_HITA00, &field_0x6a8, &temp10);
fopAcM_createChild(
PROC_ARROW_ICEEFF, fopAcM_GetID(this),
fpcNm_ARROW_ICEEFF_e, fopAcM_GetID(this),
mArrowType, &field_0x6a8,
current.roomNo, &field_0x6e6
);
@@ -977,7 +975,7 @@ BOOL daArrow_c::procStop_BG() {
if (mCoSph.ChkCoHit()) {
dComIfGp_setItemArrowNumCount(1);
fopAcM_createItemForSimpleDemo(&current.pos, dItem_ARROW_10_e, -1, NULL, NULL, 0.0f, 0.0f);
fopAcM_createItemForSimpleDemo(&current.pos, dItemNo_ARROW_10_e, -1, NULL, NULL, 0.0f, 0.0f);
mDoAud_seStart(JA_SE_CONSUMP_ITEM_GET);
fopAcM_delete(this);
return TRUE;
@@ -1287,18 +1285,18 @@ static actor_method_class daArrowMethodTable = {
};
actor_process_profile_definition g_profile_ARROW = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0009,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_ARROW,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0009,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_ARROW_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daArrow_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_ARROW,
/* Draw Prio */ fpcDwPi_ARROW_e,
/* Actor SubMtd */ &daArrowMethodTable,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_arrow_iceeff.cpp
+7 -9
View File
@@ -8,8 +8,6 @@
#include "m_Do/m_Do_mtx.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/actor/d_a_player_main.h"
#include "d/actor/d_a_arrow.h"
@@ -303,18 +301,18 @@ static actor_method_class daArrow_IceeffMethodTable = {
};
actor_process_profile_definition g_profile_ARROW_ICEEFF = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0009,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_ARROW_ICEEFF,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0009,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_ARROW_ICEEFF_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daArrow_Iceeff_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_ARROW_ICEEFF,
/* Draw Prio */ fpcDwPi_ARROW_ICEEFF_e,
/* Actor SubMtd */ &daArrow_IceeffMethodTable,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_arrow_lighteff.cpp
+7 -9
View File
@@ -8,8 +8,6 @@
#include "d/actor/d_a_player_main.h"
#include "d/actor/d_a_arrow.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "m_Do/m_Do_mtx.h"
#include "m_Do/m_Do_graphic.h"
#include "SSystem/SComponent/c_lib.h"
@@ -418,18 +416,18 @@ static actor_method_class daArrow_LighteffMethodTable = {
};
actor_process_profile_definition g_profile_ARROW_LIGHTEFF = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0009,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_ARROW_LIGHTEFF,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0009,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_ARROW_LIGHTEFF_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daArrow_Lighteff_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_ARROW_LIGHTEFF,
/* Draw Prio */ fpcDwPi_ARROW_LIGHTEFF_e,
/* Actor SubMtd */ &daArrow_LighteffMethodTable,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_atdoor.cpp
+7 -9
View File
@@ -5,8 +5,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_atdoor.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_com_inf_game.h"
#include "d/res/res_atdoor.h"
@@ -220,18 +218,18 @@ static actor_method_class l_daAtdoor_Method = {
};
actor_process_profile_definition g_profile_ATDOOR = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_ATDOOR,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_ATDOOR_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daAtdoor_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_ATDOOR,
/* Draw Prio */ fpcDwPi_ATDOOR_e,
/* Actor SubMtd */ &l_daAtdoor_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_6_e,
/* Cull Type */ fopAc_CULLBOX_6_e,
};
src/d/actor/d_a_att.cpp
+8 -10
View File
@@ -5,8 +5,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_att.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
#include "d/actor/d_a_bgn.h"
@@ -21,7 +19,7 @@ static BOOL daAtt_Draw(att_class* i_this) {
/* 000000F4-00000140 .text boss_s_sub__FPvPv */
static void* boss_s_sub(void* search, void*) {
if (fopAcM_IsActor(search) && fopAcM_GetName(search) == PROC_BGN) {
if (fopAcM_IsActor(search) && fopAcM_GetName(search) == fpcNm_BGN_e) {
return search;
}
return NULL;
@@ -239,18 +237,18 @@ static actor_method_class l_daAtt_Method = {
};
actor_process_profile_definition g_profile_ATT = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0008,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_ATT,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0008,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_ATT_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(att_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_ATT,
/* Draw Prio */ fpcDwPi_ATT_e,
/* Actor SubMtd */ &l_daAtt_Method,
/* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_auction.cpp
+16 -18
View File
@@ -9,8 +9,6 @@
#include "d/actor/d_a_player.h"
#include "d/actor/d_a_player_main.h"
#include "d/d_camera.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/res/res_pspl.h"
#include "m_Do/m_Do_controller_pad.h"
#include "d/d_auction_screen.h"
@@ -50,20 +48,20 @@ static daAuction_HIO_c l_HIO;
static daAuction_c::ItemData l_item_dat[] = {
{dItem_JOY_PENDANT_e, 0x1D10, 40, dSv_event_flag_c::UNK_0F01},
{dItem_COLLECT_MAP_27_e, 0x1D11, 5, dSv_event_flag_c::UNK_1080},
{dItem_COLLECT_MAP_18_e, 0x1D12, 60, dSv_event_flag_c::UNK_1040},
{dItem_HEART_PIECE_e, 0x1D13, 80, dSv_event_flag_c::UNK_1020},
{dItemNo_JOY_PENDANT_e, 0x1D10, 40, dSv_event_flag_c::UNK_0F01},
{dItemNo_COLLECT_MAP_27_e, 0x1D11, 5, dSv_event_flag_c::UNK_1080},
{dItemNo_COLLECT_MAP_18_e, 0x1D12, 60, dSv_event_flag_c::UNK_1040},
{dItemNo_HEART_PIECE_e, 0x1D13, 80, dSv_event_flag_c::UNK_1020},
};
static daAuction_c::ItemData l_item_dat2[] = {
{POSTMAN_STATUE, 0x1D14, 30, dSv_event_flag_c::UNK_1008},
{PRESIDENT_STATUE, 0x1D15, 40, dSv_event_flag_c::UNK_1004},
{dItemNo_POSTMAN_STATUE_e, 0x1D14, 30, dSv_event_flag_c::UNK_1008},
{dItemNo_SHOP_GURU_STATUE_e, 0x1D15, 40, dSv_event_flag_c::UNK_1004},
};
static s16 l_item_dat22[] = {
dItem_MAGIC_ARMOR_e,
dItem_COLLECT_MAP_06_e,
dItemNo_MAGIC_ARMOR_e,
dItemNo_COLLECT_MAP_06_e,
};
static NpcDatStruct l_npc_dat[7] = {
@@ -667,7 +665,7 @@ void daAuction_c::eventStartInit() {
dAuction_screen_gaugeHide();
dAuction_screen_talkEnd();
mCurrAuctionItemPID = fopAcM_create(PROC_ShopItem, l_item_dat[mCurrAuctionItemIndex].mItemID, &current.pos);
mCurrAuctionItemPID = fopAcM_create(fpcNm_ShopItem_e, l_item_dat[mCurrAuctionItemIndex].mItemID, &current.pos);
dKy_custom_colset(0, 4, 1.0f);
mLight.mPos.x = 0.0f;
@@ -1640,18 +1638,18 @@ static actor_method_class daAuctionMethodTable = {
};
actor_process_profile_definition g_profile_AUCTION = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_AUCTION,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_AUCTION_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daAuction_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_AUCTION,
/* Draw Prio */ fpcDwPi_AUCTION_e,
/* Actor SubMtd */ &daAuctionMethodTable,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_bb.cpp
+16 -18
View File
@@ -6,8 +6,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_bb.h"
#include "m_Do/m_Do_ext.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
#include "d/d_com_inf_game.h"
#include "d/d_s_play.h"
@@ -372,7 +370,7 @@ void* s_a_d_sub(void* ac1, void* ac2) {
cXyz sp14;
cXyz sp8;
if (esa_check_count < 100 && fopAc_IsActor(ac1) && fpcM_GetName(ac1) == PROC_ESA) {
if (esa_check_count < 100 && fopAc_IsActor(ac1) && fpcM_GetName(ac1) == fpcNm_ESA_e) {
esa_class* esa1 = (esa_class*)ac1;
esa_class* esa2 = (esa_class*)ac2;
@@ -1248,7 +1246,7 @@ void bb_water_check(bb_class* i_this) {
/* 00004000-0000404C .text pl_name_check__FPvPv */
void* pl_name_check(void* ac1, void* ac2) {
if (fopAc_IsActor(ac1) && fopAcM_GetName(ac1) == PROC_NPC_KAM) {
if (fopAc_IsActor(ac1) && fopAcM_GetName(ac1) == fpcNm_NPC_KAM_e) {
return ac1;
}
return NULL;
@@ -2362,14 +2360,14 @@ static BOOL daBb_Execute(bb_class* i_this) {
ac->current.angle = i_this->actor.current.angle;
ac->shape_angle = i_this->actor.current.angle;
if (i_this->unk_2EC == PROC_MO2 || i_this->unk_2EC == PROC_BK) {
if (i_this->unk_2EC == fpcNm_MO2_e || i_this->unk_2EC == fpcNm_BK_e) {
damagereaction* dr;
if (i_this->unk_2EC == PROC_MO2) {
if (i_this->unk_2EC == fpcNm_MO2_e) {
dr = &((mo2_class*)ac)->mDamageReaction;
dr->m468 = REG0_F(8) * 10.0f + -110.0f;
dr->m46C = REG0_F(9) * 10.0f + 10.0f;
} else if (i_this->unk_2EC == PROC_BK) {
} else if (i_this->unk_2EC == fpcNm_BK_e) {
dr = &((bk_class*)ac)->dr;
dr->m468 = REG0_F(8) * 10.0f + -100.0f;
dr->m46C = REG0_F(9) * 10.0f;
@@ -2748,11 +2746,11 @@ static cPhs_State daBb_Create(fopAc_ac_c* a_this) {
ac->base.parameters = (fopAcM_GetParam(i_this) & 0xFF000000) | 0xFFFF05;
if (i_this->unk_2DD == 5) {
i_this->unk_2E8 = fpcM_Create(PROC_MO2, NULL, ac);
i_this->unk_2EC = PROC_MO2;
i_this->unk_2E8 = fpcM_Create(fpcNm_MO2_e, NULL, ac);
i_this->unk_2EC = fpcNm_MO2_e;
} else {
i_this->unk_2E8 = fpcM_Create(PROC_BK, NULL, ac);
i_this->unk_2EC = PROC_BK;
i_this->unk_2E8 = fpcM_Create(fpcNm_BK_e, NULL, ac);
i_this->unk_2EC = fpcNm_BK_e;
}
} else if (i_this->unk_2D8 == 3) {
i_this->unk_2DD = 3;
@@ -2820,18 +2818,18 @@ static actor_method_class l_daBb_Method = {
};
actor_process_profile_definition g_profile_BB = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BB,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BB_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(bb_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BB,
/* Draw Prio */ fpcDwPi_BB_e,
/* Actor SubMtd */ &l_daBb_Method,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_bdk.cpp
+17 -19
View File
@@ -16,8 +16,6 @@
#include "d/d_snap.h"
#include "d/d_s_play.h"
#include "d/d_particle_name.h"
#include "d/d_priority.h"
#include "d/d_procname.h"
#include "f_op/f_op_actor_mng.h"
#include "f_op/f_op_camera.h"
#include "JSystem/JUtility/JUTReport.h"
@@ -137,7 +135,7 @@ daBdk_HIO_c::daBdk_HIO_c() {
/* 0000015C-000001A8 .text kamome_delete_sub__FPvPv */
static void* kamome_delete_sub(void* param_1, void*) {
if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_KAMOME) {
if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_KAMOME_e) {
fopAcM_delete(static_cast<fopAc_ac_c*>(param_1));
}
return NULL;
@@ -145,7 +143,7 @@ static void* kamome_delete_sub(void* param_1, void*) {
/* 000001A8-000001F4 .text kui_delete_sub__FPvPv */
static void* kui_delete_sub(void* param_1, void*) {
if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_KUI) {
if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_KUI_e) {
fopAcM_delete(static_cast<fopAc_ac_c*>(param_1));
}
return NULL;
@@ -153,7 +151,7 @@ static void* kui_delete_sub(void* param_1, void*) {
/* 000001F4-00000240 .text ep_delete_sub__FPvPv */
static void* ep_delete_sub(void* param_1, void*) {
if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_EP) {
if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_EP_e) {
fopAcM_delete(static_cast<fopAc_ac_c*>(param_1));
}
return NULL;
@@ -161,7 +159,7 @@ static void* ep_delete_sub(void* param_1, void*) {
/* 00000240-0000028C .text dk_delete_sub__FPvPv */
static void* dk_delete_sub(void* param_1, void*) {
if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_DK) {
if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_DK_e) {
fopAcM_delete(static_cast<fopAc_ac_c*>(param_1));
}
return NULL;
@@ -170,7 +168,7 @@ static void* dk_delete_sub(void* param_1, void*) {
/* 0000028C-000002E8 .text obj_delete_sub__FPvPv */
static void* obj_delete_sub(void* param_1, void*) {
fopAc_ac_c* actor = static_cast<fopAc_ac_c*>(param_1);
if (fopAcM_IsActor(actor) && fopAcM_GetName(actor) == PROC_BDKOBJ && (fopAcM_GetParam(actor) & 0xF) >= 2) {
if (fopAcM_IsActor(actor) && fopAcM_GetName(actor) == fpcNm_BDKOBJ_e && (fopAcM_GetParam(actor) & 0xF) >= 2) {
fopAcM_delete(actor);
}
return NULL;
@@ -178,7 +176,7 @@ static void* obj_delete_sub(void* param_1, void*) {
/* 000002E8-00000334 .text sea_delete_sub__FPvPv */
static void* sea_delete_sub(void* param_1, void*) {
if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_Tide) {
if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_Obj_Tide_e) {
fopAcM_delete(static_cast<fopAc_ac_c*>(param_1));
}
return NULL;
@@ -186,7 +184,7 @@ static void* sea_delete_sub(void* param_1, void*) {
/* 00000334-00000380 .text bk_delete_sub__FPvPv */
static void* bk_delete_sub(void* param_1, void*) {
if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_BK) {
if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_BK_e) {
fopAcM_delete(static_cast<fopAc_ac_c*>(param_1));
}
return NULL;
@@ -194,7 +192,7 @@ static void* bk_delete_sub(void* param_1, void*) {
/* 00000380-000003CC .text boko_delete_sub__FPvPv */
static void* boko_delete_sub(void* param_1, void*) {
if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_BOKO) {
if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_BOKO_e) {
fopAcM_delete(static_cast<fopAc_ac_c*>(param_1));
}
return NULL;
@@ -203,7 +201,7 @@ static void* boko_delete_sub(void* param_1, void*) {
/* 000003CC-00000424 .text obj2_delete_sub__FPvPv */
static void* obj2_delete_sub(void* param_1, void*) {
fopAc_ac_c* actor = static_cast<fopAc_ac_c*>(param_1);
if (fopAcM_IsActor(actor) && fopAcM_GetName(actor) == PROC_BDKOBJ && actor->model == NULL) {
if (fopAcM_IsActor(actor) && fopAcM_GetName(actor) == fpcNm_BDKOBJ_e && actor->model == NULL) {
fopAcM_delete(actor);
}
return NULL;
@@ -2116,7 +2114,7 @@ static void end(bdk_class* i_this) {
/* 00005EA0-00005F08 .text obj_s_sub__FPvPv */
static void* obj_s_sub(void* param_1, void*) {
fopAc_ac_c* actor = (fopAc_ac_c*)param_1;
if (fopAcM_IsActor(actor) && fopAcM_GetName(actor) == PROC_BDKOBJ && (fpcM_GetParam(actor) & 0xF) != 0xF && actor->health != 0) {
if (fopAcM_IsActor(actor) && fopAcM_GetName(actor) == fpcNm_BDKOBJ_e && (fpcM_GetParam(actor) & 0xF) != 0xF && actor->health != 0) {
return param_1;
}
return NULL;
@@ -4353,18 +4351,18 @@ static actor_method_class l_daBdk_Method = {
};
actor_process_profile_definition g_profile_BDK = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BDK,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BDK_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(bdk_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BDK,
/* Draw Prio */ fpcDwPi_BDK_e,
/* Actor SubMtd */ &l_daBdk_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_bdkobj.cpp
+8 -10
View File
@@ -11,8 +11,6 @@
#include "d/d_cc_d.h"
#include "d/d_cc_uty.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_s_play.h"
#include "d/res/res_bdkobj.h"
#include "f_op/f_op_actor_mng.h"
@@ -25,7 +23,7 @@ static cXyz non_pos(10000.0f, -10000.0f, 20000.0f);
/* 000000EC-00000104 .text ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */
static void ride_call_back(dBgW* param1, fopAc_ac_c* param2, fopAc_ac_c* param3) {
if (fopAcM_GetName(param3) != PROC_PLAYER) {
if (fopAcM_GetName(param3) != fpcNm_PLAYER_e) {
return;
}
param2->health = 0xA;
@@ -621,18 +619,18 @@ static actor_method_class l_daBdkobj_Method = {
};
actor_process_profile_definition g_profile_BDKOBJ = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BDKOBJ,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BDKOBJ_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(bdkobj_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BDKOBJ,
/* Draw Prio */ fpcDwPi_BDKOBJ_e,
/* Actor SubMtd */ &l_daBdkobj_Method,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_beam.cpp
+13 -15
View File
@@ -11,8 +11,6 @@
#include "d/d_cc_d.h"
#include "d/d_lib.h"
#include "d/d_particle.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_a_obj.h"
#include "d/d_s_play.h"
#include "f_op/f_op_actor_mng.h"
@@ -158,7 +156,7 @@ void daBeam_AtHitCallback(fopAc_ac_c* arg0, dCcD_GObjInf* arg1, fopAc_ac_c* arg2
daBeam_c* i_this = (daBeam_c*)arg0;
if (fopAcM_IsActor(arg2)) {
if (fopAcM_GetName(arg2) == PROC_PLAYER) {
if (fopAcM_GetName(arg2) == fpcNm_PLAYER_e) {
fopAcM_seStartCurrent(arg2, JA_SE_LK_BEAM_HIT, 0);
if (i_this->m54C != 0) {
@@ -173,7 +171,7 @@ void daBeam_AtHitCallback(fopAc_ac_c* arg0, dCcD_GObjInf* arg1, fopAc_ac_c* arg2
arg1->SetAtVec(sp20);
arg3->SetTgRVec(sp20);
}
} else if (fopAcM_GetName(arg2) == PROC_AM2) {
} else if (fopAcM_GetName(arg2) == fpcNm_AM2_e) {
arg3->ClrTgHit();
}
@@ -189,7 +187,7 @@ void daBeam_AtHitDummyCallback(fopAc_ac_c* arg0, dCcD_GObjInf* arg1, fopAc_ac_c*
daBeam_c* i_this = (daBeam_c*)arg0;
if (fopAcM_IsActor(arg2)) {
if (fopAcM_GetName(arg2) == PROC_PLAYER) {
if (fopAcM_GetName(arg2) == fpcNm_PLAYER_e) {
fopAcM_seStartCurrent(arg2, JA_SE_LK_BEAM_HIT, 0);
if (i_this->m54C != 0) {
@@ -203,7 +201,7 @@ void daBeam_AtHitDummyCallback(fopAc_ac_c* arg0, dCcD_GObjInf* arg1, fopAc_ac_c*
arg1->SetAtVec(sp20);
arg3->SetTgRVec(sp20);
}
} else if (fopAcM_GetName(arg2) == PROC_AM2) {
} else if (fopAcM_GetName(arg2) == fpcNm_AM2_e) {
arg3->ClrTgHit();
}
}
@@ -212,7 +210,7 @@ void daBeam_AtHitDummyCallback(fopAc_ac_c* arg0, dCcD_GObjInf* arg1, fopAc_ac_c*
/* 00000A00-00000AA0 .text daBeam_checkHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
void daBeam_checkHitCallback(fopAc_ac_c* arg0, dCcD_GObjInf* arg1, fopAc_ac_c* arg2, dCcD_GObjInf* arg3) {
if (fopAcM_IsActor(arg2) && arg0->parentActorID != fopAcM_GetID(arg2)) {
if (fopAcM_GetName(arg2) != PROC_PLAYER || arg1->ChkAtShieldHit()) {
if (fopAcM_GetName(arg2) != fpcNm_PLAYER_e || arg1->ChkAtShieldHit()) {
daBeam_c* i_this = (daBeam_c*)arg0;
i_this->m540 = *i_this->mCps2.GetAtHitPosP();
i_this->m53C = true;
@@ -403,7 +401,7 @@ bool daBeam_c::_execute() {
parameters |= 2;
}
m684 = fopAcM_create(PROC_Hot_Floor, parameters, &m668);
m684 = fopAcM_create(fpcNm_Hot_Floor_e, parameters, &m668);
}
m688 = 1.0f;
} else {
@@ -658,18 +656,18 @@ static actor_method_class daBeamMethodTable = {
};
actor_process_profile_definition g_profile_Beam = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_Beam,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Beam_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daBeam_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_Beam,
/* Draw Prio */ fpcDwPi_Beam_e,
/* Actor SubMtd */ &daBeamMethodTable,
/* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_bflower.cpp
+10 -12
View File
@@ -5,8 +5,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_bflower.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/res/res_vbakh.h"
#include "d/d_com_inf_game.h"
#include "d/actor/d_a_player_main.h"
@@ -345,7 +343,7 @@ BOOL daBFlower_c::actLive() {
cCcD_Obj* tg = mSph.GetTgHitObj();
if (tg != NULL) {
if (tg->ChkAtType(AT_TYPE_BOMB)) {
mpBombActor = static_cast<fopAc_ac_c*>(fopAcM_fastCreate(PROC_Bomb2, daBomb2::Act_c::prm_make(daBomb2::Start_UNK0_e, true), &current.pos, fopAcM_GetRoomNo(this), &current.angle));
mpBombActor = static_cast<fopAc_ac_c*>(fopAcM_fastCreate(fpcNm_Bomb2_e, daBomb2::Act_c::prm_make(daBomb2::Start_UNK0_e, true), &current.pos, fopAcM_GetRoomNo(this), &current.angle));
m58C = 0;
} else if (tg->ChkAtType(~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT))) {
// TODO: simplify
@@ -355,7 +353,7 @@ BOOL daBFlower_c::actLive() {
}
u32 prm = daBomb2::Act_c::prm_make(daBomb2::Start_UNK1_e, b);
mpBombActor = static_cast<fopAc_ac_c*>(fopAcM_fastCreate(PROC_Bomb2, prm, &current.pos, fopAcM_GetRoomNo(this), &current.angle));
mpBombActor = static_cast<fopAc_ac_c*>(fopAcM_fastCreate(fpcNm_Bomb2_e, prm, &current.pos, fopAcM_GetRoomNo(this), &current.angle));
m58C = 0;
}
}
@@ -366,7 +364,7 @@ BOOL daBFlower_c::actLive() {
if (fopAcM_checkCarryNow(this) && m58D != 0) {
m58C = 0;
mpBombActor = static_cast<fopAc_ac_c*>(fopAcM_fastCreate(PROC_Bomb2, daBomb2::Act_c::prm_make(daBomb2::Start_UNK2_e, false), &current.pos, fopAcM_GetRoomNo(this), &current.angle));
mpBombActor = static_cast<fopAc_ac_c*>(fopAcM_fastCreate(fpcNm_Bomb2_e, daBomb2::Act_c::prm_make(daBomb2::Start_UNK2_e, false), &current.pos, fopAcM_GetRoomNo(this), &current.angle));
fopAcM_cancelCarryNow(this);
if (mpBombActor != NULL) {
@@ -522,18 +520,18 @@ static actor_method_class daBFlowerMethodTable = {
};
actor_process_profile_definition g_profile_BOMB_FLOWER = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BOMB_FLOWER,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BOMB_FLOWER_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daBFlower_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BOMB_FLOWER,
/* Draw Prio */ fpcDwPi_BOMB_FLOWER_e,
/* Actor SubMtd */ &daBFlowerMethodTable,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_bg.cpp
+15 -16
View File
@@ -7,7 +7,6 @@
#include "d/actor/d_a_bg.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/d_magma.h"
#include "d/d_grass.h"
#include "d/d_tree.h"
@@ -405,19 +404,19 @@ static actor_method_class l_daBg_Method = {
};
actor_process_profile_definition2 g_profile_BG = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
PROC_BG,
&g_fpcLf_Method.base,
sizeof(daBg_c),
0,
0,
&g_fopAc_Method.base,
0x01C2,
&l_daBg_Method,
fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
fopAc_ACTOR_e,
fopAc_CULLBOX_0_e,
0,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BG_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daBg_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_BG_e,
/* Actor SubMtd */ &l_daBg_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
/* field_0x30 */ 0,
};
src/d/actor/d_a_bgn.cpp
+23 -25
View File
@@ -14,8 +14,6 @@
#endif
#include "d/actor/d_a_player.h"
#include "d/d_meter.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_s_play.h"
#include "d/d_snap.h"
#include "d/res/res_bgn.h"
@@ -916,7 +914,7 @@ static void room_disp(bgn_class* i_this) {
/* 00001898-0000192C .text ten_a_d_sub__FPvPv */
static void* ten_a_d_sub(void* param_1, void*) {
fopAc_ac_c* actor = (fopAc_ac_c*)param_1;
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_Obj_Vteng)) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_Obj_Vteng_e)) {
if ((actor->model != NULL) && (bgn != NULL)) {
bgn->mCC24.setModel(actor->model);
bgn->mCC24.update();
@@ -930,7 +928,7 @@ static void* ten_a_d_sub(void* param_1, void*) {
/* 0000192C-00001998 .text ki_a_d_sub__FPvPv */
static void* ki_a_d_sub(void* param_1, void*) {
ki_class* keese = (ki_class*)param_1;
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_KI)) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KI_e)) {
if (keese->actor.model != NULL) {
keese->m2B8.setModel(keese->actor.model);
keese->m2B8.update();
@@ -950,7 +948,7 @@ static void obj_disp(bgn_class* i_this) {
#if VERSION > VERSION_DEMO
/* 000019F4-00001A40 .text bgn2_s_sub__FPvPv */
static void* bgn2_s_sub(void* param_1, void*) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_BGN2)) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN2_e)) {
return param_1;
} else {
return NULL;
@@ -959,7 +957,7 @@ static void* bgn2_s_sub(void* param_1, void*) {
/* 00001A40-00001A8C .text bgn3_s_sub__FPvPv */
static void* bgn3_s_sub(void* param_1, void*) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_BGN3)) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN3_e)) {
return param_1;
} else {
return NULL;
@@ -1030,7 +1028,7 @@ static BOOL daBgn_Draw(bgn_class* i_this) {
/* 00001C40-00001C8C .text ki_del_sub__FPvPv */
static void* ki_del_sub(void* param_1, void*) {
ki_class* keese = (ki_class*)param_1;
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_KI)) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KI_e)) {
fopAcM_delete(&keese->actor);
}
return NULL;
@@ -1040,7 +1038,7 @@ static void* ki_del_sub(void* param_1, void*) {
/* 00001C8C-00001CD8 .text ks_del_sub__FPvPv */
static void* ks_del_sub(void* param_1, void*) {
ks_class* morth = (ks_class*)param_1;
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_KS)) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KS_e)) {
fopAcM_delete(&morth->actor);
}
return NULL;
@@ -1049,7 +1047,7 @@ static void* ks_del_sub(void* param_1, void*) {
/* 00001CD8-00001D30 .text ki_c_sub__FPvPv */
static void* ki_c_sub(void* param_1, void*) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_KI)) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KI_e)) {
ki_all_count++;
}
return NULL;
@@ -1109,7 +1107,7 @@ static s32 gr_check(bgn_class* i_this, cXyz* param_2) {
static void* s_b_sub(void* param_1, void* param_2) {
bgn_class* bgn = (bgn_class*)param_2;
daBomb_c* bomb = (daBomb_c*)param_1;
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_BOMB) && bomb->get_explode_instant()) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BOMB_e) && bomb->get_explode_instant()) {
cXyz local_18 = bomb->current.pos;
if (!gr_check(bgn, &local_18)) {
dComIfGp_particle_set(dPa_name::ID_AK_SN_KGTT1PUNCHSPLASH00, &local_18);
@@ -3294,7 +3292,7 @@ static void demo_camera(bgn_class* i_this) {
#if VERSION == VERSION_DEMO
/* 000019F4-00001A40 .text bgn2_s_sub__FPvPv */
static void* bgn2_s_sub(void* param_1, void*) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_BGN2)) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN2_e)) {
return param_1;
} else {
return NULL;
@@ -3303,7 +3301,7 @@ static void* bgn2_s_sub(void* param_1, void*) {
/* 00001A40-00001A8C .text bgn3_s_sub__FPvPv */
static void* bgn3_s_sub(void* param_1, void*) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_BGN3)) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN3_e)) {
return param_1;
} else {
return NULL;
@@ -3375,7 +3373,7 @@ static BOOL daBgn_Execute(bgn_class* i_this) {
local_28.x = cM_rndFX(2500.0f);
local_28.y = cM_rndF(500.0f) + 3500.0f;
local_28.x = cM_rndFX(2500.0f);
fopAcM_create(PROC_KI, 0xFFFF0003, &local_28, fopAcM_GetRoomNo(actor));
fopAcM_create(fpcNm_KI_e, 0xFFFF0003, &local_28, fopAcM_GetRoomNo(actor));
}
}
i_this->m02B5 = l_HIO.m024;
@@ -3694,17 +3692,17 @@ static cPhs_State daBgn_Create(fopAc_ac_c* a_this) {
if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_3F10)) {
i_this->m02B4 = 0xFF;
local_50.set(375.17f, REG8_F(4) + 4441.46f, REG8_F(3) + -15.0f);
fopAcM_create(PROC_HIMO3, 0xf, &local_50, fopAcM_GetRoomNo(a_this));
fopAcM_create(fpcNm_HIMO3_e, 0xf, &local_50, fopAcM_GetRoomNo(a_this));
local_50.set(375.17f, REG8_F(4) + 4453.96f, 0.0f);
csXyz cStack_58(0, 0x4000, 0);
fopAcM_create(PROC_KUI, 0xffff0400, &local_50, fopAcM_GetRoomNo(a_this), &cStack_58, NULL, 0xFF, NULL);
fopAcM_create(fpcNm_KUI_e, 0xffff0400, &local_50, fopAcM_GetRoomNo(a_this), &cStack_58, NULL, 0xFF, NULL);
} else {
for (s32 parameters = 0, i = 0; parameters < 8; i++, parameters++) {
fopAcM_create(PROC_ATT, parameters, &a_this->current.pos, fopAcM_GetRoomNo(a_this));
fopAcM_create(fpcNm_ATT_e, parameters, &a_this->current.pos, fopAcM_GetRoomNo(a_this));
i_this->mAAA8[i].m308 = 3;
}
fopAcM_create(PROC_BGN2, 0, &a_this->current.pos, fopAcM_GetRoomNo(a_this));
fopAcM_create(PROC_BGN3, 0, &a_this->current.pos, fopAcM_GetRoomNo(a_this));
fopAcM_create(fpcNm_BGN2_e, 0, &a_this->current.pos, fopAcM_GetRoomNo(a_this));
fopAcM_create(fpcNm_BGN3_e, 0, &a_this->current.pos, fopAcM_GetRoomNo(a_this));
mDoAud_bgmStart(JA_BGM_BGN_KUGUTSU);
a_this->health = 3;
a_this->max_health = 3;
@@ -3732,18 +3730,18 @@ static actor_method_class l_daBgn_Method = {
};
actor_process_profile_definition g_profile_BGN = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BGN,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BGN_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(bgn_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BGN,
/* Draw Prio */ fpcDwPi_BGN_e,
/* Actor SubMtd */ &l_daBgn_Method,
/* Status */ DEMO_SELECT(fopAcStts_UNK4000_e | fopAcStts_UNK40000_e, fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e),
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_bgn2.cpp
+11 -13
View File
@@ -8,8 +8,6 @@
#include "d/actor/d_a_bgn.h"
#include "d/actor/d_a_bgn3.h"
#include "d/actor/d_a_player.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
#include "d/d_s_play.h"
#include "d/res/res_bgn.h"
@@ -89,7 +87,7 @@ static void anm_init(bgn2_class* i_this, int bckFileIdx, f32 morf, u8 loopMode,
/* 000002BC-00000308 .text bgn_s_sub__FPvPv */
static void* bgn_s_sub(void* param_1, void*) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_BGN)) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN_e)) {
return param_1;
} else {
return NULL;
@@ -98,7 +96,7 @@ static void* bgn_s_sub(void* param_1, void*) {
/* 00000308-00000354 .text bgn3_s_sub__FPvPv */
static void* bgn3_s_sub(void* param_1, void*) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_BGN3)) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN3_e)) {
return param_1;
} else {
return NULL;
@@ -810,7 +808,7 @@ static void damage_check(bgn2_class* i_this) {
/* 00002C88-00002CE0 .text ki_c_sub__FPvPv */
static void* ki_c_sub(void* param_1, void*) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_KI)) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KI_e)) {
ki_all_count++;
}
return NULL;
@@ -1051,7 +1049,7 @@ static BOOL daBgn2_Execute(bgn2_class* i_this) {
local_b8.x = cM_rndFX(2500.0f);
local_b8.y = cM_rndF(500.0f) + 3500.0f;
local_b8.z = cM_rndFX(2500.0f);
fopAcM_create(PROC_KI, 0xFFFF0003, &local_b8, fopAcM_GetRoomNo(actor));
fopAcM_create(fpcNm_KI_e, 0xFFFF0003, &local_b8, fopAcM_GetRoomNo(actor));
}
}
i_this->mAcch.CrrPos(*dComIfG_Bgsp());
@@ -1270,18 +1268,18 @@ static actor_method_class l_daBgn2_Method = {
};
actor_process_profile_definition g_profile_BGN2 = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BGN2,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BGN2_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(bgn2_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BGN2,
/* Draw Prio */ fpcDwPi_BGN2_e,
/* Actor SubMtd */ &l_daBgn2_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_bgn3.cpp
+13 -15
View File
@@ -8,8 +8,6 @@
#include "d/actor/d_a_bgn.h"
#include "d/actor/d_a_esa.h"
#include "d/actor/d_a_player.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
#include "d/d_s_play.h"
#include "d/res/res_bgn.h"
@@ -109,7 +107,7 @@ daBgn3_HIO_c::daBgn3_HIO_c() {
#if VERSION > VERSION_DEMO
/* 000001F4-00000240 .text bgn_s_sub__FPvPv */
static void* bgn_s_sub(void* param_1, void*) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_BGN)) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN_e)) {
return param_1;
} else {
return NULL;
@@ -222,7 +220,7 @@ static void drop_eff_set(bgn3_class* i_this) {
/* 0000101C-00001068 .text esa_s_sub__FPvPv */
static void* esa_s_sub(void* param_1, void*) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_ESA)) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_ESA_e)) {
return param_1;
} else {
return NULL;
@@ -619,7 +617,7 @@ static void damage_check(bgn3_class* i_this) {
i_this->m100A8 = 0xf;
sVar7 = l_HIO.m2A;
}
} else if (fopAcM_GetName(atInfo.mpActor) == PROC_ARROW) {
} else if (fopAcM_GetName(atInfo.mpActor) == fpcNm_ARROW_e) {
bVar10 = 2;
i_this->m100A8 = 10;
sVar7 = l_HIO.m28;
@@ -1045,7 +1043,7 @@ static void move(bgn3_class* i_this) {
#if VERSION == VERSION_DEMO
/* 000001F4-00000240 .text bgn_s_sub__FPvPv */
static void* bgn_s_sub(void* param_1, void*) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_BGN)) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BGN_e)) {
return param_1;
} else {
return NULL;
@@ -1055,7 +1053,7 @@ static void* bgn_s_sub(void* param_1, void*) {
/* 00004058-000040B0 .text ki_c_sub__FPvPv */
static void* ki_c_sub(void* param_1, void*) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_KS)) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KS_e)) {
ki_all_count++;
}
return NULL;
@@ -1126,7 +1124,7 @@ static BOOL daBgn3_Execute(bgn3_class* i_this) {
local_28.x = cM_rndFX(2500.0f);
local_28.y = cM_rndF(500.0f) + 3500.0f;
local_28.z = cM_rndFX(2500.0f);
fopAcM_create(PROC_KS, 3, &local_28, fopAcM_GetRoomNo(actor));
fopAcM_create(fpcNm_KS_e, 3, &local_28, fopAcM_GetRoomNo(actor));
}
}
return TRUE;
@@ -1348,18 +1346,18 @@ static actor_method_class l_daBgn3_Method = {
};
actor_process_profile_definition g_profile_BGN3 = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BGN3,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BGN3_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(bgn3_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BGN3,
/* Draw Prio */ fpcDwPi_BGN3_e,
/* Actor SubMtd */ &l_daBgn3_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_bigelf.cpp
+7 -9
View File
@@ -5,8 +5,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_bigelf.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
/* 00000078-0000016C .text oct_delete__10daBigelf_cFv */
void daBigelf_c::oct_delete() {
@@ -367,18 +365,18 @@ static actor_method_class l_daBigelf_Method = {
};
actor_process_profile_definition g_profile_BIGELF = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BIGELF,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BIGELF_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daBigelf_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BIGELF,
/* Draw Prio */ fpcDwPi_BIGELF_e,
/* Actor SubMtd */ &l_daBigelf_Method,
/* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_12_e,
/* Cull Type */ fopAc_CULLBOX_12_e,
};
src/d/actor/d_a_bita.cpp
+8 -10
View File
@@ -11,8 +11,6 @@
#include "d/d_bg_s_movebg_actor.h"
#include "d/d_com_inf_game.h"
#include "d/d_kankyo.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/actor/d_a_btd.h"
#include "m_Do/m_Do_ext.h"
#include "m_Do/m_Do_mtx.h"
@@ -27,7 +25,7 @@ static u32 ita_Ef[] = { BITA_BRK_EF_BTDITA0, BITA_BRK_EF_BTDITA1 };
/* 00000078-000000C4 .text b_a_sub__FPvPv */
static void* b_a_sub(void* search, void* user) {
UNUSED(user);
if (fopAc_IsActor(search) && fopAcM_GetName(search) == PROC_BTD)
if (fopAc_IsActor(search) && fopAcM_GetName(search) == fpcNm_BTD_e)
return search;
return NULL;
}
@@ -282,18 +280,18 @@ static actor_method_class l_daBita_Method = {
};
actor_process_profile_definition g_profile_BITA = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0003,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BITA,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0003,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BITA_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(bita_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BITA,
/* Draw Prio */ fpcDwPi_BITA_e,
/* Actor SubMtd */ &l_daBita_Method,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ENV_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_bk.cpp
+18 -20
View File
@@ -9,8 +9,6 @@
#include "d/res/res_bk.h"
#include "f_op/f_op_actor_mng.h"
#include "f_op/f_op_camera.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_com_inf_game.h"
#include "d/actor/d_a_obj_search.h"
#include "d/actor/d_a_bridge.h"
@@ -670,7 +668,7 @@ static s32 target_info_count;
/* 00002C4C-00002CD4 .text s_w_sub__FPvPv */
static void* s_w_sub(void* param_1, void*) {
if (fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_BOKO) {
if (fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_BOKO_e) {
daBoko_c* boko = (daBoko_c*)param_1;
if (fopAcM_GetParam(boko) != daBoko_c::Type_MOBLIN_SPEAR_e && !fopAcM_checkCarryNow(boko)) {
if (target_info_count < (s32)ARRAY_SIZE(target_info)) {
@@ -741,7 +739,7 @@ static fpc_ProcID search_wepon(bk_class* i_this) {
/* 00002FB0-0000302C .text s_b_sub__FPvPv */
static void* s_b_sub(void* param_1, void*) {
if (fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_BOMB) {
if (fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_BOMB_e) {
daBomb_c* bomb = (daBomb_c*)param_1;
// TODO: why is it checking the bomb's params as a single field instead of just one param? bug?
if (fopAcM_GetParam(bomb) != 0) {
@@ -1194,9 +1192,9 @@ static void jyunkai(bk_class* i_this) {
/* 0000488C-000048E4 .text ken_s_sub__FPvPv */
static void* ken_s_sub(void* param_1, void*) {
if (fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_ITEM) {
if (fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_ITEM_e) {
daItem_c* item = (daItem_c*)param_1;
if (item->getItemNo() == dItem_DROPPED_SWORD_e) {
if (item->getItemNo() == dItemNo_DROPPED_SWORD_e) {
return param_1;
}
}
@@ -1430,7 +1428,7 @@ static void stand(bk_class* i_this) {
/* 000053E0-000054E0 .text s_s_sub__FPvPv */
static void* s_s_sub(void* r29, void* r30) {
bk_class* i_this = (bk_class*)r30;
if (fopAc_IsActor(r29) && fopAcM_GetName(r29) == PROC_OBJ_SEARCH) {
if (fopAc_IsActor(r29) && fopAcM_GetName(r29) == fpcNm_OBJ_SEARCH_e) {
daObj_Search::Act_c* search = (daObj_Search::Act_c*)r29;
cXyz sp18 = i_this->home.pos - search->current.pos;
if (sp18.abs() < 600.0f) {
@@ -1769,7 +1767,7 @@ u16 learn_check;
/* 0000647C-000064D8 .text shot_s_sub__FPvPv */
static void* shot_s_sub(void* param_1, void*) {
if (fopAc_IsActor(param_1) && (learn_check & 0x400) && fopAcM_GetName(param_1) == PROC_HIMO2) {
if (fopAc_IsActor(param_1) && (learn_check & 0x400) && fopAcM_GetName(param_1) == fpcNm_HIMO2_e) {
return param_1;
}
return NULL;
@@ -2249,7 +2247,7 @@ temp_1B8:
fopAc_ac_c* hitActor = yari_hit_check(i_this);
if (hitActor != NULL) {
if (fopAcM_GetName(hitActor) == PROC_PLAYER) {
if (fopAcM_GetName(hitActor) == fpcNm_PLAYER_e) {
// Note: The code seems to assume that the hit actor and the controlled player are the same actor.
// This isn't necessarily correct, but likely doesn't cause any bugs in practice as checkPlayerGuard always
// returns false for non-Link player actors.
@@ -2269,7 +2267,7 @@ temp_1B8:
i_this->m0300[1] = 100;
}
}
} else if (fopAcM_GetName(hitActor) == PROC_BK) {
} else if (fopAcM_GetName(hitActor) == fpcNm_BK_e) {
i_this->m11FC = fopAcM_GetID(hitActor);
}
} else {
@@ -3783,7 +3781,7 @@ static void damage_check(bk_class* i_this) {
/* 0000BCD4-0000BD30 .text s_s2_sub__FPvPv */
static void* s_s2_sub(void* param_1, void*) {
if (fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_OBJ_SEARCH) {
if (fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_OBJ_SEARCH_e) {
if (daObj_Search::Act_c::getFindFlag()) {
return param_1;
}
@@ -3905,7 +3903,7 @@ static void waki_set(bk_class* i_this) {
params->base.parameters = (i_this->m02B6 << 0x10) | 0xFF00FF39; // TODO clean up parameters
}
params->room_no = fopAcM_GetRoomNo(actor);
fopAcM_Create(PROC_BK, NULL, params);
fopAcM_Create(fpcNm_BK_e, NULL, params);
i_this->m1212++;
}
}
@@ -5085,7 +5083,7 @@ static cPhs_State daBk_Create(fopAc_ac_c* i_actor) {
} else {
weaponType = 0;
}
i_this->m1200 = fopAcM_create(PROC_BOKO, weaponType, &i_actor->current.pos, fopAcM_GetRoomNo(i_actor));
i_this->m1200 = fopAcM_create(fpcNm_BOKO_e, weaponType, &i_actor->current.pos, fopAcM_GetRoomNo(i_actor));
i_this->m1214 = 1;
i_this->m02D5 &= 0x40;
}
@@ -5322,18 +5320,18 @@ static actor_method_class l_daBk_Method = {
};
actor_process_profile_definition g_profile_BK = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BK,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BK_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(bk_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BK,
/* Draw Prio */ fpcDwPi_BK_e,
/* Actor SubMtd */ &l_daBk_Method,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_bl.cpp
+7 -9
View File
@@ -5,8 +5,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_bl.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
/* 00000078-00000178 .text draw_SUB__FP8bl_class */
@@ -196,18 +194,18 @@ static actor_method_class l_daBL_Method = {
};
actor_process_profile_definition g_profile_BL = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BL,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BL_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(bl_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BL,
/* Draw Prio */ fpcDwPi_BL_e,
/* Actor SubMtd */ &l_daBL_Method,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_bmd.cpp
+13 -15
View File
@@ -11,8 +11,6 @@
#include "d/d_kankyo_wether.h"
#include "d/d_lib.h"
#include "d/res/res_bmd.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
#include "d/d_s_play.h"
#include "d/d_snap.h"
@@ -1142,7 +1140,7 @@ void ride_call_back(dBgW* bgw, fopAc_ac_c* i_ac, fopAc_ac_c* i_pt) {
cLib_addCalc2(&i_pt->current.pos.y, i_ac->current.pos.y, 1.0f, REG0_F(2) + 400.0f);
cLib_addCalc2(&i_pt->current.pos.z, i_ac->current.pos.z, 1.0f, REG0_F(2) + 400.0f);
i_pt->old.pos = i_pt->current.pos;
if (fopAcM_GetName(i_pt) == PROC_PLAYER) {
if (fopAcM_GetName(i_pt) == fpcNm_PLAYER_e) {
i_this->m942 = 5;
}
}
@@ -1489,7 +1487,7 @@ void demo_camera(bmd_class* i_this) {
i_this->mB70 = 1;
csXyz cStack_b8(0, 0, 0);
cStack_b8.y = actor->shape_angle.y + 0x8BB8;
fopAcM_create(PROC_NPC_CB1, 0, &i_this->m2E0, fopAcM_GetRoomNo(actor), &cStack_b8);
fopAcM_create(fpcNm_NPC_CB1_e, 0, &i_this->m2E0, fopAcM_GetRoomNo(actor), &cStack_b8);
i_this->m2DC = 0;
// Fall-through
}
@@ -1972,11 +1970,11 @@ static cPhs_State daBmd_Create(fopAc_ac_c* a_this) {
i_this->mSmokeCb[i].setFollowOff();
}
if (dComIfGs_isStageBossEnemy() && (dComIfGp_getStartStageName()[0] != 'X')) {
if ((!dComIfGs_checkGetItem(dItem_PEARL_FARORE_e)) || (REG0_S(6) != 0)) {
if ((!dComIfGs_checkGetItem(dItemNo_PEARL_FARORE_e)) || (REG0_S(6) != 0)) {
local_30.x = 100.0f;
local_30.y = 0.0f;
local_30.z = 800.0f;
fopAcM_create(PROC_NPC_CB1, 0, &local_30, fopAcM_GetRoomNo(a_this));
fopAcM_create(fpcNm_NPC_CB1_e, 0, &local_30, fopAcM_GetRoomNo(a_this));
}
res = cPhs_ERROR_e;
} else if (!fopAcM_entrySolidHeap(a_this, solidHeapCB, 0x96000)) {
@@ -1995,12 +1993,12 @@ static cPhs_State daBmd_Create(fopAc_ac_c* a_this) {
for (s32 i = 0; i < 20; i++) {
fopAcM_prm_class* params = fopAcM_CreateAppend();
params->base.parameters = i;
fopAcM_create(PROC_BMDHAND, 0, params);
fopAcM_create(fpcNm_BMDHAND_e, 0, params);
}
for (s32 i = 0; i < 8; i++) {
fopAcM_prm_class* params = fopAcM_CreateAppend();
params->base.parameters = i;
fopAcM_create(PROC_BMDFOOT, 0, params);
fopAcM_create(fpcNm_BMDFOOT_e, 0, params);
}
a_this->home.pos.y += REG0_F(2) + 20.0f;
a_this->current.pos.y = a_this->home.pos.y;
@@ -2045,18 +2043,18 @@ static actor_method_class l_daBmd_Method = {
};
actor_process_profile_definition g_profile_BMD = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BMD,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BMD_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(bmd_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BMD,
/* Draw Prio */ fpcDwPi_BMD_e,
/* Actor SubMtd */ &l_daBmd_Method,
/* Status */ fopAcStts_SHOWMAP_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_bmdfoot.cpp
+8 -10
View File
@@ -10,8 +10,6 @@
#include "d/actor/d_a_bmd.h"
#include "d/d_s_play.h"
#include "m_Do/m_Do_ext.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
class daBmdfoot_HIO_c : public JORReflexible {
@@ -590,7 +588,7 @@ void move(bmdfoot_class* i_this) {
/* 000021B8-00002204 .text s_a_d_sub__FPvPv */
void* s_a_d_sub(void* search, void* param_2) {
UNUSED(param_2);
if ((fopAcM_IsActor(search)) && (fopAcM_GetName(search) == PROC_BMD)) {
if ((fopAcM_IsActor(search)) && (fopAcM_GetName(search) == fpcNm_BMD_e)) {
return search;
} else {
return NULL;
@@ -829,18 +827,18 @@ static actor_method_class l_daBmdfoot_Method = {
};
actor_process_profile_definition g_profile_BMDFOOT = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BMDFOOT,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BMDFOOT_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(bmdfoot_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BMDFOOT,
/* Draw Prio */ fpcDwPi_BMDFOOT_e,
/* Actor SubMtd */ &l_daBmdfoot_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_bmdhand.cpp
+8 -10
View File
@@ -8,8 +8,6 @@
#include "d/d_s_play.h"
#include "d/res/res_bmdhand.h"
#include "d/actor/d_a_bmd.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
class daBmdhand_HIO_c : public JORReflexible {
@@ -662,7 +660,7 @@ void hand_move(bmdhand_class* i_this) {
/* 00002E74-00002EC0 .text s_a_d_sub__FPvPv */
void* s_a_d_sub(void* param_1, void* param_2) {
UNUSED(param_2);
if ((fopAcM_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_BMD)) {
if ((fopAcM_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BMD_e)) {
return param_1;
} else {
return NULL;
@@ -832,18 +830,18 @@ static actor_method_class l_daBmdhand_Method = {
};
actor_process_profile_definition g_profile_BMDHAND = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BMDHAND,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BMDHAND_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(bmdhand_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BMDHAND,
/* Draw Prio */ fpcDwPi_BMDHAND_e,
/* Actor SubMtd */ &l_daBmdhand_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_bo.cpp
+7 -9
View File
@@ -5,8 +5,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_bo.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
/* 000000EC-000001E8 .text smoke_set__FP8bo_class */
@@ -233,18 +231,18 @@ static actor_method_class l_daBO_Method = {
};
actor_process_profile_definition g_profile_BO = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BO,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BO_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(bo_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BO,
/* Draw Prio */ fpcDwPi_BO_e,
/* Actor SubMtd */ &l_daBO_Method,
/* Status */ fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_boko.cpp
+8 -10
View File
@@ -13,8 +13,6 @@
#include "d/res/res_spear.h"
#include "d/res/res_pgsw.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_bg_s_lin_chk.h"
#include "d/d_s_play.h"
#include "SSystem/SComponent/c_counter.h"
@@ -530,7 +528,7 @@ BOOL daBoko_c::procMove() {
setRoomInfo();
if (mAcch.ChkGroundHit() && fVar14_3 <= 2.5f) {
if (dComIfG_Bgsp()->ChkMoveBG(mAcch.m_gnd) && fopAcM_GetName(dComIfG_Bgsp()->GetActorPointer(mAcch.m_gnd)) == PROC_TBOX) {
if (dComIfG_Bgsp()->ChkMoveBG(mAcch.m_gnd) && fopAcM_GetName(dComIfG_Bgsp()->GetActorPointer(mAcch.m_gnd)) == fpcNm_TBOX_e) {
if (speedF < 15.0f) {
speedF = 15.0f;
}
@@ -1057,18 +1055,18 @@ static actor_method_class l_daBoko_Method = {
};
actor_process_profile_definition g_profile_BOKO = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0009,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BOKO,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0009,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BOKO_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daBoko_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BOKO,
/* Draw Prio */ fpcDwPi_BOKO_e,
/* Actor SubMtd */ &l_daBoko_Method,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_bomb2.cpp
+8 -10
View File
@@ -8,8 +8,6 @@
#include "d/actor/d_a_sea.h"
#include "d/actor/d_a_player.h"
#include "d/d_a_obj.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_kankyo_wether.h"
#include "d/d_com_inf_game.h"
#include "d/res/res_vbakh.h"
@@ -656,7 +654,7 @@ namespace daBomb2 {
hitNormal *= attr().field_0x44;
mWindVec.abs2();
fopAc_ac_c* hitActor = mSph.GetTgHitAc();
if (hitActor && fopAcM_GetProfName(hitActor) == PROC_PLAYER) {
if (hitActor && fopAcM_GetProfName(hitActor) == fpcNm_PLAYER_e) {
s16 hitObjAngleY = cM_atan2s(hitNormal.x, hitNormal.z);
f32 f2 = cM_scos(hitActor->shape_angle.y - hitObjAngleY);
if (f2 > 0.0f) {
@@ -1339,18 +1337,18 @@ namespace daBomb2 {
}
actor_process_profile_definition g_profile_Bomb2 = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_Bomb2,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Bomb2_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daBomb2::Act_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_Bomb2,
/* Draw Prio */ fpcDwPi_Bomb2_e,
/* Actor SubMtd */ &daBomb2::Mthd_Table,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_bomb3.inc
+8 -10
View File
@@ -7,8 +7,6 @@
#include "SSystem/SComponent/c_counter.h"
#include "d/d_a_obj.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/actor/d_a_player_main.h"
#include "d/actor/d_a_sea.h"
#include "d/d_kankyo_wether.h"
@@ -1173,7 +1171,7 @@ void daBomb_c::set_wind_vec() {
hitNormal *= 50.0f;
mWindVec.abs2();
fopAc_ac_c* hitActor = mSph.GetTgHitAc();
if (hitActor && fopAcM_GetProfName(hitActor) == PROC_PLAYER) {
if (hitActor && fopAcM_GetProfName(hitActor) == fpcNm_PLAYER_e) {
s16 hitObjAngleY = cM_atan2s(hitNormal.x, hitNormal.z);
f32 f2 = cM_scos(hitActor->shape_angle.y - hitObjAngleY);
if (f2 > 0.0f) {
@@ -1520,18 +1518,18 @@ static actor_method_class l_daBomb_Method = {
};
actor_process_profile_definition g_profile_BOMB = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BOMB,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BOMB_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daBomb_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BOMB,
/* Draw Prio */ fpcDwPi_BOMB_e,
/* Actor SubMtd */ &l_daBomb_Method,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_boomerang.cpp
+7 -9
View File
@@ -6,8 +6,6 @@
#include "d/dolzel.h" // IWYU pragma: keep
#include "d/actor/d_a_boomerang.h"
#include "d/d_camera.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
#include "d/d_material.h"
#include "d/actor/d_a_player_main.h"
@@ -854,18 +852,18 @@ static actor_method_class l_daBoomerang_Method = {
};
actor_process_profile_definition g_profile_BOOMERANG = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BOOMERANG,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BOOMERANG_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daBoomerang_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BOOMERANG,
/* Draw Prio */ fpcDwPi_BOOMERANG_e,
/* Actor SubMtd */ &l_daBoomerang_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_boss_item.cpp
+7 -9
View File
@@ -7,8 +7,6 @@
#include "d/actor/d_a_boss_item.h"
#include "f_op/f_op_actor.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_com_inf_game.h"
/* 00000078-00000080 .text daBossItem_IsDelete__FP14bossitem_class */
@@ -48,18 +46,18 @@ static actor_method_class daBossItem_METHODS = {
};
actor_process_profile_definition g_profile_BOSSITEM = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BOSSITEM,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BOSSITEM_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(bossitem_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BOSSITEM,
/* Draw Prio */ fpcDwPi_BOSSITEM_e,
/* Actor SubMtd */ &daBossItem_METHODS,
/* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_bpw.cpp
+15 -17
View File
@@ -10,8 +10,6 @@
#include "d/d_lib.h"
#include "d/d_snap.h"
#include "d/res/res_bpw.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
#include "d/d_s_play.h"
#include "f_op/f_op_camera.h"
@@ -699,7 +697,7 @@ void noroi_check(bpw_class* i_this) {
dComIfGp_particle_set(dPa_name::ID_IT_JN_PIYOHIT00, &i_this->mFire1DousaPos);
r31 |= ACTOR_TYPE_TORITUKI;
local_28.y = fopCamM_GetAngleY(camera);
fopAcM_create(PROC_BPW, r31, &i_this->mFire1DousaPos, fopAcM_GetRoomNo(actor), &local_28);
fopAcM_create(fpcNm_BPW_e, r31, &i_this->mFire1DousaPos, fopAcM_GetRoomNo(actor), &local_28);
}
}
}
@@ -905,7 +903,7 @@ void* skull_search_sub(void* param_1, void* param_2) {
fopAc_ac_c* actor = (fopAc_ac_c*)param_1;
if ((get_check_count < 100) && (fopAcM_IsActor(actor))) {
if ((fopAcM_GetName(actor) == PROC_BL) && (actor->health > 0)) {
if ((fopAcM_GetName(actor) == fpcNm_BL_e) && (actor->health > 0)) {
check_info[get_check_count] = actor;
get_check_count++;
}
@@ -1474,7 +1472,7 @@ void action_kougeki(bpw_class* i_this) {
if (pfVar6 != NULL) {
u32 params = ACTOR_TYPE_DAMAGE_BALL;
params |= DAMAGE_ACTION_LINE << 8;
i_this->m400 = fopAcM_create(PROC_BPW, params, &pfVar6->m358, fopAcM_GetRoomNo(actor), &actor->current.angle);
i_this->m400 = fopAcM_create(fpcNm_BPW_e, params, &pfVar6->m358, fopAcM_GetRoomNo(actor), &actor->current.angle);
i_this->mSomeCountdownTimers[0] = 0x46;
i_this->mSomeCountdownTimers[0] += (int)cM_rndF(i_this->mSomeCountdownTimers[0]);
i_this->m47A = 0x300;
@@ -1551,7 +1549,7 @@ void action_kougeki(bpw_class* i_this) {
cXyz cStack_44;
MtxPosition(&local_38, &cStack_44);
cStack_44 += pfVar7->m358;
i_this->m400 = fopAcM_create(PROC_BPW, params, &cStack_44, fopAcM_GetRoomNo(actor), &actor->current.angle);
i_this->m400 = fopAcM_create(fpcNm_BPW_e, params, &cStack_44, fopAcM_GetRoomNo(actor), &actor->current.angle);
i_this->mSomeCountdownTimers[1] = REG12_S(4) + 7;
if (player->checkConfuse()) {
i_this->mSomeCountdownTimers[1] = REG12_S(4) + 9;
@@ -2034,7 +2032,7 @@ void action_damage(bpw_class* i_this) {
u32 uVar2 = uVar14 << 9 | 0xFF000003;
for (i = 0; i < actor->health; i++) {
f32 maxPoeSpread = ((s16)pwSpreadAmount * 0.25f);
i_this->mChildPoeIds[i] = fopAcM_createChild(PROC_PW, fopAcM_GetID(i_this), uVar2, &local_58, fopAcM_GetRoomNo(actor), &pwAngle);
i_this->mChildPoeIds[i] = fopAcM_createChild(fpcNm_PW_e, fopAcM_GetID(i_this), uVar2, &local_58, fopAcM_GetRoomNo(actor), &pwAngle);
currRandomAngle += pwSpreadAmount;
pwAngle.y = (s16)currRandomAngle;
pwAngle.y += (int)cM_rndFX((f32)maxPoeSpread);
@@ -2098,7 +2096,7 @@ void action_bunri_dousa(bpw_class* i_this) {
u32 uVar2 = uVar14 << 9 | 0xFF000003;
for (i = 0; i < actor->health; i++) {
f32 maxPoeSpread = ((s16)pwSpreadAmount * 0.25f);
i_this->mChildPoeIds[i] = fopAcM_createChild(PROC_PW, fopAcM_GetID(i_this), uVar2, &local_58, fopAcM_GetRoomNo(actor), &pwAngle);
i_this->mChildPoeIds[i] = fopAcM_createChild(fpcNm_PW_e, fopAcM_GetID(i_this), uVar2, &local_58, fopAcM_GetRoomNo(actor), &pwAngle);
currRandomAngle += pwSpreadAmount;
pwAngle.y = (s16)currRandomAngle;
pwAngle.y += (int)cM_rndFX((f32)maxPoeSpread);
@@ -4604,7 +4602,7 @@ static cPhs_State daBPW_Create(fopAc_ac_c* a_this) {
BG_check(i_this);
draw_SUB(i_this);
sp18.y += 0x4000;
i_this->m3FC = fopAcM_createChild(PROC_BPW, fopAcM_GetID(i_this), ACTOR_TYPE_KANTERA, &i_this->mChildActorPos, fopAcM_GetRoomNo(a_this), &sp18);
i_this->m3FC = fopAcM_createChild(fpcNm_BPW_e, fopAcM_GetID(i_this), ACTOR_TYPE_KANTERA, &i_this->mChildActorPos, fopAcM_GetRoomNo(a_this), &sp18);
i_this->mAttWaitTimer = 1;
kantera_calc(i_this);
if ((dComIfGp_getStartStageName()[0] != 'X') && (REG0_S(9) != 0 || (!dComIfGs_isStageBossDemo()))) {
@@ -4620,7 +4618,7 @@ static cPhs_State daBPW_Create(fopAc_ac_c* a_this) {
uVar14 = (s16)cM_rndF(4.99f);
u32 uVar2 = uVar14 << 9 | 0xFF000004;
for (s32 i = 0; i < 15; i++) {
i_this->mChildPoeIds[i] = fopAcM_createChild(PROC_PW, fopAcM_GetID(i_this), uVar2, &local_58, fopAcM_GetRoomNo(a_this), &pwAngle);
i_this->mChildPoeIds[i] = fopAcM_createChild(fpcNm_PW_e, fopAcM_GetID(i_this), uVar2, &local_58, fopAcM_GetRoomNo(a_this), &pwAngle);
currRandomAngle += pwSpreadAmount;
pwAngle.y = (s16)currRandomAngle;
pwAngle.y += (int)cM_rndFX((s16)pwSpreadAmount * 0.25f);
@@ -4712,18 +4710,18 @@ static actor_method_class l_daBPW_Method = {
};
actor_process_profile_definition g_profile_BPW = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BPW,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BPW_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(bpw_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BPW,
/* Draw Prio */ fpcDwPi_BPW_e,
/* Actor SubMtd */ &l_daBPW_Method,
/* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_branch.cpp
+7 -9
View File
@@ -8,8 +8,6 @@
#include "d/res/res_kwood_00.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "m_Do/m_Do_mtx.h"
#include "d/d_kankyo.h"
#include "JSystem/J3DGraphBase/J3DMaterial.h"
@@ -245,16 +243,16 @@ static actor_method_class l_daBranch_Method = {
};
actor_process_profile_definition g_profile_BRANCH = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BRANCH,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BRANCH_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daBranch_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BRANCH,
/* Draw Prio */ fpcDwPi_BRANCH_e,
/* Actor SubMtd */ &l_daBranch_Method,
#if VERSION == VERSION_DEMO
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
@@ -262,5 +260,5 @@ actor_process_profile_definition g_profile_BRANCH = {
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
#endif
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_bridge.cpp
+12 -14
View File
@@ -6,8 +6,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_bridge.h"
#include "d/d_bg_w.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
#include "d/d_path.h"
#include "d/d_com_inf_game.h"
@@ -54,15 +52,15 @@ void ride_call_back(dBgW* bgw, fopAc_ac_c* i_ac, fopAc_ac_c* i_pt) {
i_pt->speed.y = -5.0f;
f32 fVar7;
if (fpcM_GetName(i_pt) == PROC_PLAYER) {
if (fpcM_GetName(i_pt) == fpcNm_PLAYER_e) {
fVar7 = 100.0f;
pBr->m3F4 = -31.0f;
i_this->m033C = 5;
} else if (fpcM_GetName(i_pt) == PROC_MO2) {
} else if (fpcM_GetName(i_pt) == fpcNm_MO2_e) {
fVar7 = 150.0f;
pBr->m3F4 = -40.0f;
i_pt->speed.y = -20.0f;
} else if (fpcM_GetName(i_pt) == PROC_BK) {
} else if (fpcM_GetName(i_pt) == fpcNm_BK_e) {
bk_class* bk = (bk_class*)i_pt;
bk->speed.y = -20.0f;
fVar7 = 100.0f;
@@ -84,7 +82,7 @@ void ride_call_back(dBgW* bgw, fopAc_ac_c* i_ac, fopAc_ac_c* i_pt) {
} else {
fVar7 = 50.0f;
pBr->m3F4 = -10.0f;
if (fpcM_GetName(i_pt) == PROC_BOMB) {
if (fpcM_GetName(i_pt) == fpcNm_BOMB_e) {
daBomb_c* bomb = (daBomb_c*)i_pt;
if (bomb->getBombRestTime() <= 1) {
@@ -840,7 +838,7 @@ void bridge_move(bridge_class* i_this) {
/* 00002A1C-00002A8C .text s_a_b_sub__FPvPv */
void* s_a_b_sub(void* ac1, void* ac2) {
if (fopAc_IsActor(ac1) && fpcM_GetName(ac1) == PROC_BRIDGE && ac1 != ac2) {
if (fopAc_IsActor(ac1) && fpcM_GetName(ac1) == fpcNm_BRIDGE_e && ac1 != ac2) {
bridge_class* bridge = (bridge_class*)ac1;
if ((bridge->mTypeBits & 0x82) == 2) {
return ac1;
@@ -1530,18 +1528,18 @@ static actor_method_class l_daBridge_Method = {
};
actor_process_profile_definition g_profile_BRIDGE = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0003,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BRIDGE,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0003,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BRIDGE_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(bridge_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BRIDGE,
/* Draw Prio */ fpcDwPi_BRIDGE_e,
/* Actor SubMtd */ &l_daBridge_Method,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_bst.cpp
+11 -13
View File
@@ -19,8 +19,6 @@
#include "f_op/f_op_msg_mng.h"
#include "m_Do/m_Do_ext.h"
#include "m_Do/m_Do_graphic.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
#include "JSystem/JUtility/JUTReport.h"
@@ -1087,7 +1085,7 @@ static BOOL bom_eat_check(bst_class* i_this) {
if (hit_obj != NULL) {
fopAc_ac_c* hit_actor = (fopAc_ac_c*)hit_obj->GetAc();
daBomb_c* bomb = (daBomb_c*)hit_actor;
if (hit_actor != NULL && fopAcM_GetName(hit_actor) == PROC_BOMB && bomb->getBombCheck_Flag() == 0 && bomb->getBombRestTime() > 1) {
if (hit_actor != NULL && fopAcM_GetName(hit_actor) == fpcNm_BOMB_e && bomb->getBombCheck_Flag() == 0 && bomb->getBombRestTime() > 1) {
i_this->mBombId = fopAcM_GetID(bomb);
bomb->setBombCheck_Flag();
bomb->change_state(daBomb_c::STATE_2);
@@ -1576,12 +1574,12 @@ static void hana_demo(bst_class* i_this) {
if ((s32)i_this->m02B8->getFrame() == 26) {
int itemNo;
if (dComIfGs_getArrowNum() == 0) {
itemNo = dItem_ARROW_10_e;
itemNo = dItemNo_ARROW_10_e;
MtxP mtx = i_this->m02B8->getModel()->getAnmMtx(6);
cMtx_copy(mtx, *calc_mtx);
i_this->m2E9E = 0;
} else {
itemNo = dItem_BOMB_5_e;
itemNo = dItemNo_BOMB_5_e;
MtxP mtx = i_this->m02B8->getModel()->getAnmMtx(7);
cMtx_copy(mtx, *calc_mtx);
i_this->m2E9E = 1;
@@ -3166,7 +3164,7 @@ static cPhs_State daBst_Create(fopAc_ac_c* a_this) {
i_this->mEyeHealth[1] = 2;
i_this->mEyeHealth[0] = 2;
for (s32 i = 0; i < (s32)ARRAY_SIZE(i_this->m2E90); i++) {
i_this->m2E90[i] = fopAcM_create(PROC_ATT, 100, &actor->current.pos, fopAcM_GetRoomNo(actor));
i_this->m2E90[i] = fopAcM_create(fpcNm_ATT_e, 100, &actor->current.pos, fopAcM_GetRoomNo(actor));
}
for (s32 i = 0; i < (s32)ARRAY_SIZE(i_this->mCcD_beams); i++) {
i_this->mCcD_beams[i].Set(beam_sph_src);
@@ -3198,18 +3196,18 @@ static actor_method_class l_daBst_Method = {
};
actor_process_profile_definition g_profile_BST = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BST,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BST_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(bst_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BST,
/* Draw Prio */ fpcDwPi_BST_e,
/* Actor SubMtd */ &l_daBst_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_btd.cpp
+11 -13
View File
@@ -16,8 +16,6 @@
#include "d/res/res_btd.h"
#include "m_Do/m_Do_ext.h"
#include "m_Do/m_Do_graphic.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
#include "f_op/f_op_camera.h"
#include "JSystem/JUtility/JUTReport.h"
@@ -1790,7 +1788,7 @@ static void move(btd_class* i_this) {
/* 00005BCC-00005C24 .text k_a_d_sub__FPvPv */
static void* k_a_d_sub(void* i_this, void* param_2) {
UNUSED(param_2);
if (((fopAcM_IsActor(i_this)) && (fopAcM_GetName(i_this) == PROC_KUI)) && (fopAcM_GetParam(i_this) == 0x511)) {
if (((fopAcM_IsActor(i_this)) && (fopAcM_GetName(i_this) == fpcNm_KUI_e)) && (fopAcM_GetParam(i_this) == 0x511)) {
return i_this;
}
return NULL;
@@ -1799,7 +1797,7 @@ static void* k_a_d_sub(void* i_this, void* param_2) {
/* 00005C24-00005C70 .text dr2_a_d_sub__FPvPv */
static void* dr2_a_d_sub(void* i_this, void* param_2) {
UNUSED(param_2);
if ((fopAcM_IsActor(i_this)) && (fopAcM_GetName(i_this) == PROC_DR2)) {
if ((fopAcM_IsActor(i_this)) && (fopAcM_GetName(i_this) == fpcNm_DR2_e)) {
return i_this;
} else {
return NULL;
@@ -1809,7 +1807,7 @@ static void* dr2_a_d_sub(void* i_this, void* param_2) {
/* 00005C70-00005CC8 .text wepon_s_sub__FPvPv */
static void* wepon_s_sub(void* i_this, void* param_2) {
UNUSED(param_2);
if (((fopAcM_IsActor(i_this)) && (fopAcM_GetName(i_this) == PROC_HIMO2)) || (fopAcM_GetName(i_this) == PROC_BOOMERANG)) {
if (((fopAcM_IsActor(i_this)) && (fopAcM_GetName(i_this) == fpcNm_HIMO2_e)) || (fopAcM_GetName(i_this) == fpcNm_BOOMERANG_e)) {
return i_this;
}
return NULL;
@@ -2982,7 +2980,7 @@ static cPhs_State daBtd_Create(fopAc_ac_c* a_this) {
i_this->floor = dComIfGp_getMagma()->newFloor(local_48, actor->scale, fopAcM_GetRoomNo(actor), -0xFA);
JUT_ASSERT(DEMO_SELECT(6003, 6096), i_this->floor != NULL);
}
fopAcM_create(PROC_Ykgr, 0x10FF00, &actor->current.pos);
fopAcM_create(fpcNm_Ykgr_e, 0x10FF00, &actor->current.pos);
dKy_custom_timeset(l_HIO.m30);
return cPhs_COMPLEATE_e;
}
@@ -2996,18 +2994,18 @@ static actor_method_class l_daBtd_Method = {
};
actor_process_profile_definition g_profile_BTD = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BTD,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BTD_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(btd_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BTD,
/* Draw Prio */ fpcDwPi_BTD_e,
/* Actor SubMtd */ &l_daBtd_Method,
/* Status */ fopAcStts_UNK40000_e | fopAcStts_BOSS_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_bwd.cpp
+12 -14
View File
@@ -9,8 +9,6 @@
#include "d/actor/d_a_player.h"
#include "d/actor/d_a_player_main.h"
#include "d/d_lib.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
#include "d/d_s_play.h"
#include "d/d_bg_s_movebg_actor.h"
@@ -115,7 +113,7 @@ void* ko_s_sub(void* param_1, void* param_2) {
UNUSED(param_2);
fopAc_ac_c* actor = (fopAc_ac_c*)param_1;
if ((fopAcM_IsActor(actor)) && (fopAcM_GetName(actor) == PROC_BWDS)) {
if ((fopAcM_IsActor(actor)) && (fopAcM_GetName(actor) == fpcNm_BWDS_e)) {
if (ko_count < l_HIO.m26) {
ko_ac[ko_count] = actor;
ko_count++;
@@ -130,7 +128,7 @@ void* ko_delete_sub(void* param_1, void* param_2) {
UNUSED(param_2);
bwds_class* actor = (bwds_class*)param_1;
if ((fopAcM_IsActor(actor)) && (fopAcM_GetName(actor) == PROC_BWDS)) {
if ((fopAcM_IsActor(actor)) && (fopAcM_GetName(actor) == fpcNm_BWDS_e)) {
actor->m04F4 = 1;
}
return FALSE;
@@ -613,7 +611,7 @@ void sita_hit(bwd_class* i_this) {
{
local_2c = i_this->mTongueSegments[0].m04;
local_2c.y = REG0_F(9) + -600.0f + l_HIO.m28;
fopAcM_create(PROC_BWDS, 0x23, &local_2c, fopAcM_GetRoomNo(actor));
fopAcM_create(fpcNm_BWDS_e, 0x23, &local_2c, fopAcM_GetRoomNo(actor));
if (i_this->m1710 == 0) {
if (dComIfGp_getStartStageName()[0] == 'X') {
mDoAud_bgmStart(JA_BGM_UNK_152);
@@ -2166,7 +2164,7 @@ static BOOL daBwd_Execute(bwd_class* i_this) {
}
if (i_this->m18D8 == 0) {
i_this->m18D8 = 1;
fopAcM_create(PROC_BWDG, 0, &actor->home.pos, fopAcM_GetRoomNo(actor), NULL, NULL, 0xff, NULL);
fopAcM_create(fpcNm_BWDG_e, 0, &actor->home.pos, fopAcM_GetRoomNo(actor), NULL, NULL, 0xff, NULL);
}
if (i_this->m17C4 != 0) {
if (i_this->m17C4 == 0xFF) {
@@ -2575,7 +2573,7 @@ static cPhs_State daBwd_Create(fopAc_ac_c* a_this) {
i_this->m1714 = a_this->tevStr;
#endif
#if VERSION == VERSION_USA
i_this->m1BC0 = fopAcM_create(PROC_ATT, 0x65, &a_this->current.pos, fopAcM_GetRoomNo(a_this));
i_this->m1BC0 = fopAcM_create(fpcNm_ATT_e, 0x65, &a_this->current.pos, fopAcM_GetRoomNo(a_this));
#endif
return cPhs_COMPLEATE_e;
}
@@ -2589,18 +2587,18 @@ static actor_method_class l_daBwd_Method = {
};
actor_process_profile_definition g_profile_BWD = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BWD,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BWD_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(bwd_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BWD,
/* Draw Prio */ fpcDwPi_BWD_e,
/* Actor SubMtd */ &l_daBwd_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_BOSS_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_bwdg.cpp
+8 -10
View File
@@ -8,8 +8,6 @@
#include "d/res/res_bwdg.h"
#include "d/d_bg_w_hf.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/actor/d_a_bwd.h"
#include "f_op/f_op_actor_mng.h"
#include "dolphin/gf/GF.h"
@@ -159,7 +157,7 @@ static void wave_cont(bwdg_class* i_this, u8 r4) {
/* 00000734-00000780 .text boss_a_d_sub__FPvPv */
static void* boss_a_d_sub(void* param_1, void* param_2) {
UNUSED(param_2);
if (fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_BWD) {
if (fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_BWD_e) {
return param_1;
}
return NULL;
@@ -254,18 +252,18 @@ static actor_method_class l_daBwdg_Method = {
};
actor_process_profile_definition g_profile_BWDG = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BWDG,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BWDG_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(bwdg_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BWDG,
/* Draw Prio */ fpcDwPi_BWDG_e,
/* Actor SubMtd */ &l_daBwdg_Method,
/* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_bwds.cpp
+7 -9
View File
@@ -7,8 +7,6 @@
#include "d/d_cc_uty.h"
#include "d/d_bg_s_gnd_chk.h"
#include "d/actor/d_a_bwds.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
#include "d/d_s_play.h"
#include "m_Do/m_Do_mtx.h"
@@ -1087,18 +1085,18 @@ static actor_method_class l_daBwds_Method = {
};
actor_process_profile_definition g_profile_BWDS = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_BWDS,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_BWDS_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(bwds_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_BWDS,
/* Draw Prio */ fpcDwPi_BWDS_e,
/* Actor SubMtd */ &l_daBwds_Method,
/* Status */ fopAcStts_UNK40000_e | fopAcStts_UNK80000_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_canon.cpp
+8 -10
View File
@@ -11,11 +11,9 @@
#include "d/actor/d_a_sea.h"
#include "d/res/res_bomber.h"
#include "m_Do/m_Do_ext.h"
#include "d/d_procname.h"
#include "d/d_2dnumber.h"
#include "d/d_kankyo.h"
#include "d/d_kankyo_wether.h"
#include "d/d_priority.h"
#include "d/d_s_play.h"
#include "d/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
@@ -190,7 +188,7 @@ void* daCanon_BreakTarget(void* arg1, void* arg2) {
if (fopAcM_IsActor(arg1) && fopAcM_GetName(arg1) == tk_Obj_Barrel2_e) {
fopAc_ac_c* ac1 = (fopAc_ac_c*)arg1;
if (fopAcM_GetID(arg2) == fopAcM_GetLinkId(ac1)) {
fopAcM_create(PROC_BOMB, daBomb_c::prm_make(daBomb_c::STATE_0, false, false), &ac1->current.pos, -1, NULL, NULL, -1, dEv_extra_createCB);
fopAcM_create(fpcNm_BOMB_e, daBomb_c::prm_make(daBomb_c::STATE_0, false, false), &ac1->current.pos, -1, NULL, NULL, -1, dEv_extra_createCB);
}
}
return NULL;
@@ -706,18 +704,18 @@ static actor_method_class daCanonMethodTable = {
};
actor_process_profile_definition g_profile_Canon = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0003,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_Canon,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0003,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Canon_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daCanon_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_Canon,
/* Draw Prio */ fpcDwPi_Canon_e,
/* Actor SubMtd */ &daCanonMethodTable,
/* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_cc.cpp
+13 -15
View File
@@ -9,8 +9,6 @@
#include "d/actor/d_a_bomb.h"
#include "d/actor/d_a_bomb2.h"
#include "d/res/res_cc.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_s_play.h"
#include "d/d_snap.h"
#include "d/d_com_inf_game.h"
@@ -274,12 +272,12 @@ void* s_b_sub(void* arg0, void* arg1) {
UNUSED(arg1);
if (fopAcM_IsActor(arg0)) {
bool bVar2 = false;
if (fopAcM_GetName(arg0) == PROC_BOMB) {
if (fopAcM_GetName(arg0) == fpcNm_BOMB_e) {
daBomb_c* bomb = (daBomb_c*)arg0;
if (bomb->chk_state(daBomb_c::STATE_0)) {
bVar2 = true;
}
} else if (fopAcM_GetName(arg0) == PROC_Bomb2) {
} else if (fopAcM_GetName(arg0) == fpcNm_Bomb2_e) {
daBomb2::Act_c* bomb2 = (daBomb2::Act_c*)arg0;
if (bomb2->chk_explode() != false) {
bVar2 = true;
@@ -2006,7 +2004,7 @@ void* tsubo_search(void* arg1, void* arg2) {
if (tmp < 100)
#endif
{
if (fopAcM_IsActor(actor1) && fopAcM_GetName(actor1) == PROC_TSUBO && actor1->current.pos.x == i_this->actor.current.pos.x &&
if (fopAcM_IsActor(actor1) && fopAcM_GetName(actor1) == fpcNm_TSUBO_e && actor1->current.pos.x == i_this->actor.current.pos.x &&
std::fabsf(actor1->current.pos.y - i_this->actor.current.pos.y) < 10.0f && actor1->current.pos.z == i_this->actor.current.pos.z)
{
i_this->m30C = fopAcM_GetID(actor1);
@@ -2095,15 +2093,15 @@ static BOOL daCC_Execute(cc_class* i_this) {
i_this->actor.model = NULL;
switch (i_this->mColorType) {
case 2:
fopAcM_setGbaName(&i_this->actor, dItem_BOW_e, 30, 0x2b);
fopAcM_setGbaName(&i_this->actor, dItemNo_BOW_e, 30, 0x2b);
break;
case 3:
fopAcM_setGbaName(&i_this->actor, dItem_MIRROR_SHIELD_e, 16, 0x2e);
fopAcM_setGbaName(&i_this->actor, dItemNo_MIRROR_SHIELD_e, 16, 0x2e);
break;
case 4:
fopAcM_setGbaName(&i_this->actor, dItem_BOW_e, 10, 0x28);
fopAcM_setGbaName(&i_this->actor, dItemNo_BOW_e, 10, 0x28);
break;
}
@@ -2757,18 +2755,18 @@ static actor_method_class l_daCC_Method = {
};
actor_process_profile_definition g_profile_CC = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_CC,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_CC_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(cc_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_CC,
/* Draw Prio */ fpcDwPi_CC_e,
/* Actor SubMtd */ &l_daCC_Method,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_coming2.cpp
+23 -25
View File
@@ -5,8 +5,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_coming2.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_bg_s_lin_chk.h"
#include "d/d_bg_s_wtr_chk.h"
#include "d/d_bg_s_gnd_chk.h"
@@ -16,21 +14,21 @@
#include "d/actor/d_a_obj_barrel2.h"
s32 daComing2::coming_make_item_no_table[] = {
dItem_GREEN_RUPEE_e,
dItem_GREEN_RUPEE_e,
dItem_GREEN_RUPEE_e,
dItem_GREEN_RUPEE_e,
dItem_GREEN_RUPEE_e,
dItem_BLUE_RUPEE_e,
dItem_BLUE_RUPEE_e,
dItem_BLUE_RUPEE_e,
dItem_BLUE_RUPEE_e,
dItem_BLUE_RUPEE_e,
dItem_YELLOW_RUPEE_e,
dItem_YELLOW_RUPEE_e,
dItem_YELLOW_RUPEE_e,
dItem_YELLOW_RUPEE_e,
dItem_YELLOW_RUPEE_e,
dItemNo_GREEN_RUPEE_e,
dItemNo_GREEN_RUPEE_e,
dItemNo_GREEN_RUPEE_e,
dItemNo_GREEN_RUPEE_e,
dItemNo_GREEN_RUPEE_e,
dItemNo_BLUE_RUPEE_e,
dItemNo_BLUE_RUPEE_e,
dItemNo_BLUE_RUPEE_e,
dItemNo_BLUE_RUPEE_e,
dItemNo_BLUE_RUPEE_e,
dItemNo_YELLOW_RUPEE_e,
dItemNo_YELLOW_RUPEE_e,
dItemNo_YELLOW_RUPEE_e,
dItemNo_YELLOW_RUPEE_e,
dItemNo_YELLOW_RUPEE_e,
};
static void dummy() {
@@ -231,7 +229,7 @@ BOOL daComing2::Act_c::make_coming_param(cXyz* outPos, daObjBarrel2::Type_e* out
*outType = daObjBarrel2::Type_01_e;
*outHasFlag = false;
*outDroppedItem = (unk_2A4 < 0xFu) ? coming_make_item_no_table[unk_2A4] : dItem_RECOVER_FAIRY_e;
*outDroppedItem = (unk_2A4 < 0xFu) ? coming_make_item_no_table[unk_2A4] : dItemNo_RECOVER_FAIRY_e;
return TRUE;
}
return FALSE;
@@ -676,18 +674,18 @@ static actor_method_class Mthd_Table = {
}; // namespace daComing2
actor_process_profile_definition g_profile_Coming2 = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_Coming2,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Coming2_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daComing2::Act_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_Coming2,
/* Draw Prio */ fpcDwPi_Coming2_e,
/* Actor SubMtd */ &daComing2::Mthd_Table,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_coming3.cpp
+8 -10
View File
@@ -8,8 +8,6 @@
#include "d/actor/d_a_player.h"
#include "d/actor/d_a_sea.h"
#include "d/actor/d_a_obj_barrel2.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/res/res_always.h"
#include "d/d_bg_s_gnd_chk.h"
#include "d/d_bg_s_wtr_chk.h"
@@ -196,7 +194,7 @@ void daComing3::Act_c::coming_start_main() {
if (unk_400 == fpcM_ERROR_PROCESS_ID_e) {
static s32 make_item_table[] = {
dItem_BLUE_RUPEE_e, dItem_YELLOW_RUPEE_e,
dItemNo_BLUE_RUPEE_e, dItemNo_YELLOW_RUPEE_e,
};
unk_400 = daObjBarrel2::Act_c::make_coming(
&sp18,
@@ -512,18 +510,18 @@ static actor_method_class Mthd_Table = {
}; // namespace daComing3
actor_process_profile_definition g_profile_Coming3 = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_Coming3,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Coming3_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daComing3::Act_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_Coming3,
/* Draw Prio */ fpcDwPi_Coming3_e,
/* Actor SubMtd */ &daComing3::Mthd_Table,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_dai.cpp
+10 -12
View File
@@ -8,8 +8,6 @@
#include "d/actor/d_a_player.h"
#include "d/actor/d_a_dai_item.h"
#include "d/res/res_fdai.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_item.h"
#include "d/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
@@ -102,9 +100,9 @@ void daDai_c::CreateInit() {
if (dComIfGs_getEventReg(m_savelabel[mSaveID])) {
#if VERSION <= VERSION_JPN
void* pfVar3 = fopAcM_fastCreate(PROC_STANDITEM, dComIfGs_getEventReg(m_savelabel[mSaveID]), &current.pos, -1, &current.angle);
void* pfVar3 = fopAcM_fastCreate(fpcNm_STANDITEM_e, dComIfGs_getEventReg(m_savelabel[mSaveID]), &current.pos, -1, &current.angle);
#else
void* pfVar3 = fopAcM_fastCreate(PROC_STANDITEM, dComIfGs_getEventReg(m_savelabel[mSaveID]), &current.pos, fopAcM_GetRoomNo(this), &current.angle);
void* pfVar3 = fopAcM_fastCreate(fpcNm_STANDITEM_e, dComIfGs_getEventReg(m_savelabel[mSaveID]), &current.pos, fopAcM_GetRoomNo(this), &current.angle);
#endif
m850 = fopAcM_GetID(pfVar3);
incNowItemNum();
@@ -116,7 +114,7 @@ void daDai_c::CreateInit() {
cPhs_State daDai_c::_create() {
fopAcM_ct(this, daDai_c);
if (!checkItemGet(dItem_DELIVERY_BAG_e, TRUE)) {
if (!checkItemGet(dItemNo_DELIVERY_BAG_e, TRUE)) {
return cPhs_ERROR_e;
}
@@ -375,18 +373,18 @@ static actor_method_class daDaiMethodTable = {
};
actor_process_profile_definition g_profile_DAI = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_DAI,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_DAI_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daDai_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_DAI,
/* Draw Prio */ fpcDwPi_DAI_e,
/* Actor SubMtd */ &daDaiMethodTable,
/* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_dai_item.cpp
+125 -127
View File
@@ -7,127 +7,125 @@
#include "d/actor/d_a_dai_item.h"
#include "SSystem/SComponent/c_math.h"
#include "d/d_kankyo_wether.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_s_play.h"
#include "d/res/res_fdai.h"
#include "d/res/res_cloth.h"
const char daStandItem_c::m_arcname[] = "Fdai";
const s16 daStandItem_c::m_bmdidx[] = {
FDAI_BDL_FOBJ00, /* FLOWER_1 */
FDAI_BDL_FOBJ01, /* FLOWER_2 */
FDAI_BDL_FOBJ02, /* FLOWER_3 */
FDAI_BDL_FOBJ03, /* HEROS_FLAG */
FDAI_BDL_FOBJ04, /* TAIRYO_FLAG */
FDAI_BDL_FOBJ05, /* SALES_FLAG */
FDAI_BDL_FOBJ06, /* WIND_FLAG */
FDAI_BDL_FOBJ07, /* RED_FLAG */
FDAI_BDL_FOBJ08, /* FOSSIL_HEAD */
FDAI_BDL_FOBJ09, /* WATER_STATUE */
FDAI_BDL_FOBJ10, /* POSTMAN_STATUE */
FDAI_BDL_FOBJ11, /* PRESIDENT_STATUE */
FDAI_BDL_FOBJ00, /* dItemNo_TOWN_FLOWER_e */
FDAI_BDL_FOBJ01, /* dItemNo_SEA_FLOWER_e */
FDAI_BDL_FOBJ02, /* dItemNo_EXOTIC_FLOWER_e */
FDAI_BDL_FOBJ03, /* dItemNo_HEROS_FLAG_e */
FDAI_BDL_FOBJ04, /* dItemNo_BIG_CATCH_FLAG_e */
FDAI_BDL_FOBJ05, /* dItemNo_BIG_SALE_FLAG_e */
FDAI_BDL_FOBJ06, /* dItemNo_PINWHEEL_e */
FDAI_BDL_FOBJ07, /* dItemNo_SICKLE_MOON_FLAG_e */
FDAI_BDL_FOBJ08, /* dItemNo_SKULL_TOWER_IDOL_e */
FDAI_BDL_FOBJ09, /* dItemNo_FOUNTAIN_IDOL_e */
FDAI_BDL_FOBJ10, /* dItemNo_POSTMAN_STATUE_e */
FDAI_BDL_FOBJ11, /* dItemNo_SHOP_GURU_STATUE_e */
};
const s16 daStandItem_c::m_bckidx[] = {
FDAI_BCK_FOBJ00, /* FLOWER_1 */
FDAI_BCK_FOBJ01, /* FLOWER_2 */
FDAI_BCK_FOBJ02, /* FLOWER_3 */
-1, /* HEROS_FLAG */
-1, /* TAIRYO_FLAG */
FDAI_BCK_FOBJ05, /* SALES_FLAG */
-1, /* WIND_FLAG */
FDAI_BCK_FOBJ07, /* RED_FLAG */
FDAI_BCK_FOBJ08, /* FOSSIL_HEAD */
FDAI_BCK_FOBJ09, /* WATER_STATUE */
FDAI_BCK_FOBJ10, /* POSTMAN_STATUE */
FDAI_BCK_FOBJ11, /* PRESIDENT_STATUE */
FDAI_BCK_FOBJ00, /* dItemNo_TOWN_FLOWER_e */
FDAI_BCK_FOBJ01, /* dItemNo_SEA_FLOWER_e */
FDAI_BCK_FOBJ02, /* dItemNo_EXOTIC_FLOWER_e */
-1, /* dItemNo_HEROS_FLAG_e */
-1, /* dItemNo_BIG_CATCH_FLAG_e */
FDAI_BCK_FOBJ05, /* dItemNo_BIG_SALE_FLAG_e */
-1, /* dItemNo_PINWHEEL_e */
FDAI_BCK_FOBJ07, /* dItemNo_SICKLE_MOON_FLAG_e */
FDAI_BCK_FOBJ08, /* dItemNo_SKULL_TOWER_IDOL_e */
FDAI_BCK_FOBJ09, /* dItemNo_FOUNTAIN_IDOL_e */
FDAI_BCK_FOBJ10, /* dItemNo_POSTMAN_STATUE_e */
FDAI_BCK_FOBJ11, /* dItemNo_SHOP_GURU_STATUE_e */
};
const u16 daStandItem_c::m_heapsize[] = {
0x2000, /* FLOWER_1 */
0x2000, /* FLOWER_2 */
0x2000, /* FLOWER_3 */
0x2000, /* HEROS_FLAG */
0x2000, /* TAIRYO_FLAG */
0x2000, /* SALES_FLAG */
0x2000, /* WIND_FLAG */
0x2000, /* RED_FLAG */
0x2000, /* FOSSIL_HEAD */
0x2000, /* WATER_STATUE */
0x2000, /* POSTMAN_STATUE */
0x2000, /* PRESIDENT_STATUE */
0x2000, /* dItemNo_TOWN_FLOWER_e */
0x2000, /* dItemNo_SEA_FLOWER_e */
0x2000, /* dItemNo_EXOTIC_FLOWER_e */
0x2000, /* dItemNo_HEROS_FLAG_e */
0x2000, /* dItemNo_BIG_CATCH_FLAG_e */
0x2000, /* dItemNo_BIG_SALE_FLAG_e */
0x2000, /* dItemNo_PINWHEEL_e */
0x2000, /* dItemNo_SICKLE_MOON_FLAG_e */
0x2000, /* dItemNo_SKULL_TOWER_IDOL_e */
0x2000, /* dItemNo_FOUNTAIN_IDOL_e */
0x2000, /* dItemNo_POSTMAN_STATUE_e */
0x2000, /* dItemNo_SHOP_GURU_STATUE_e */
};
const s16 daStandItem_c::m_anim_min_time[] = {
50, /* FLOWER_1 */
50, /* FLOWER_2 */
50, /* FLOWER_3 */
50, /* HEROS_FLAG */
50, /* TAIRYO_FLAG */
50, /* SALES_FLAG */
50, /* WIND_FLAG */
50, /* RED_FLAG */
30, /* FOSSIL_HEAD */
20, /* WATER_STATUE */
50, /* POSTMAN_STATUE */
50, /* PRESIDENT_STATUE */
50, /* dItemNo_TOWN_FLOWER_e */
50, /* dItemNo_SEA_FLOWER_e */
50, /* dItemNo_EXOTIC_FLOWER_e */
50, /* dItemNo_HEROS_FLAG_e */
50, /* dItemNo_BIG_CATCH_FLAG_e */
50, /* dItemNo_BIG_SALE_FLAG_e */
50, /* dItemNo_PINWHEEL_e */
50, /* dItemNo_SICKLE_MOON_FLAG_e */
30, /* dItemNo_SKULL_TOWER_IDOL_e */
20, /* dItemNo_FOUNTAIN_IDOL_e */
50, /* dItemNo_POSTMAN_STATUE_e */
50, /* dItemNo_SHOP_GURU_STATUE_e */
};
const s16 daStandItem_c::m_anim_max_time[] = {
100, /* FLOWER_1 */
100, /* FLOWER_2 */
100, /* FLOWER_3 */
100, /* HEROS_FLAG */
100, /* TAIRYO_FLAG */
100, /* SALES_FLAG */
100, /* WIND_FLAG */
100, /* RED_FLAG */
100, /* FOSSIL_HEAD */
20, /* WATER_STATUE */
100, /* POSTMAN_STATUE */
100, /* PRESIDENT_STATUE */
100, /* dItemNo_TOWN_FLOWER_e */
100, /* dItemNo_SEA_FLOWER_e */
100, /* dItemNo_EXOTIC_FLOWER_e */
100, /* dItemNo_HEROS_FLAG_e */
100, /* dItemNo_BIG_CATCH_FLAG_e */
100, /* dItemNo_BIG_SALE_FLAG_e */
100, /* dItemNo_PINWHEEL_e */
100, /* dItemNo_SICKLE_MOON_FLAG_e */
100, /* dItemNo_SKULL_TOWER_IDOL_e */
20, /* dItemNo_FOUNTAIN_IDOL_e */
100, /* dItemNo_POSTMAN_STATUE_e */
100, /* dItemNo_SHOP_GURU_STATUE_e */
};
const s16 daStandItem_c::m_stop_min_time[] = {
50, /* FLOWER_1 */
50, /* FLOWER_2 */
50, /* FLOWER_3 */
50, /* HEROS_FLAG */
50, /* TAIRYO_FLAG */
50, /* SALES_FLAG */
50, /* WIND_FLAG */
50, /* RED_FLAG */
50, /* FOSSIL_HEAD */
600, /* WATER_STATUE */
50, /* POSTMAN_STATUE */
0, /* PRESIDENT_STATUE */
50, /* dItemNo_TOWN_FLOWER_e */
50, /* dItemNo_SEA_FLOWER_e */
50, /* dItemNo_EXOTIC_FLOWER_e */
50, /* dItemNo_HEROS_FLAG_e */
50, /* dItemNo_BIG_CATCH_FLAG_e */
50, /* dItemNo_BIG_SALE_FLAG_e */
50, /* dItemNo_PINWHEEL_e */
50, /* dItemNo_SICKLE_MOON_FLAG_e */
50, /* dItemNo_SKULL_TOWER_IDOL_e */
600, /* dItemNo_FOUNTAIN_IDOL_e */
50, /* dItemNo_POSTMAN_STATUE_e */
0, /* dItemNo_SHOP_GURU_STATUE_e */
};
const s16 daStandItem_c::m_stop_max_time[] = {
100, /* FLOWER_1 */
100, /* FLOWER_2 */
100, /* FLOWER_3 */
100, /* HEROS_FLAG */
100, /* TAIRYO_FLAG */
100, /* SALES_FLAG */
100, /* WIND_FLAG */
100, /* RED_FLAG */
200, /* FOSSIL_HEAD */
1000, /* WATER_STATUE */
100, /* POSTMAN_STATUE */
0, /* PRESIDENT_STATUE */
100, /* dItemNo_TOWN_FLOWER_e */
100, /* dItemNo_SEA_FLOWER_e */
100, /* dItemNo_EXOTIC_FLOWER_e */
100, /* dItemNo_HEROS_FLAG_e */
100, /* dItemNo_BIG_CATCH_FLAG_e */
100, /* dItemNo_BIG_SALE_FLAG_e */
100, /* dItemNo_PINWHEEL_e */
100, /* dItemNo_SICKLE_MOON_FLAG_e */
200, /* dItemNo_SKULL_TOWER_IDOL_e */
1000, /* dItemNo_FOUNTAIN_IDOL_e */
100, /* dItemNo_POSTMAN_STATUE_e */
0, /* dItemNo_SHOP_GURU_STATUE_e */
};
/* 800E3638-800E36C8 .text convItemNo__FUc */
static u32 convItemNo(u8 itemNo) {
switch (itemNo) {
case FLOWER_1: return 0;
case FLOWER_2: return 1;
case FLOWER_3: return 2;
case HEROS_FLAG: return 3;
case TAIRYO_FLAG: return 4;
case SALES_FLAG: return 5;
case WIND_FLAG: return 6;
case RED_FLAG: return 7;
case FOSSIL_HEAD: return 8;
case WATER_STATUE: return 9;
case POSTMAN_STATUE: return 10;
case PRESIDENT_STATUE: return 11;
case dItemNo_TOWN_FLOWER_e: return 0;
case dItemNo_SEA_FLOWER_e: return 1;
case dItemNo_EXOTIC_FLOWER_e: return 2;
case dItemNo_HEROS_FLAG_e: return 3;
case dItemNo_BIG_CATCH_FLAG_e: return 4;
case dItemNo_BIG_SALE_FLAG_e: return 5;
case dItemNo_PINWHEEL_e: return 6;
case dItemNo_SICKLE_MOON_FLAG_e: return 7;
case dItemNo_SKULL_TOWER_IDOL_e: return 8;
case dItemNo_FOUNTAIN_IDOL_e: return 9;
case dItemNo_POSTMAN_STATUE_e: return 10;
case dItemNo_SHOP_GURU_STATUE_e: return 11;
default: return 0;
}
}
@@ -219,7 +217,7 @@ BOOL daStandItem_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, m_bmdidx[mItemType]);
JUT_ASSERT(0x239, modelData != NULL);
if (mItemNo == PRESIDENT_STATUE) {
if (mItemNo == dItemNo_SHOP_GURU_STATUE_e) {
mpModel = mDoExt_J3DModel__create(modelData, 0x0, 0x11020203);
} else {
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
@@ -234,18 +232,18 @@ BOOL daStandItem_c::CreateHeap() {
mpBckAnm = new mDoExt_bckAnm();
static const u32 playmode[] = {
/* FLOWER_1 */ J3DFrameCtrl::EMode_LOOP,
/* FLOWER_2 */ J3DFrameCtrl::EMode_LOOP,
/* FLOWER_3 */ J3DFrameCtrl::EMode_LOOP,
/* HEROS_FLAG */ -1,
/* TAIRYO_FLAG */ -1,
/* SALES_FLAG */ J3DFrameCtrl::EMode_LOOP,
/* WIND_FLAG */ J3DFrameCtrl::EMode_LOOP,
/* RED_FLAG */ J3DFrameCtrl::EMode_LOOP,
/* FOSSIL_HEAD */ J3DFrameCtrl::EMode_LOOP,
/* WATER_STATUE */ J3DFrameCtrl::EMode_NONE,
/* POSTMAN_STATUE */ J3DFrameCtrl::EMode_LOOP,
/* PRESIDENT_STATUE */ J3DFrameCtrl::EMode_LOOP,
/* dItemNo_TOWN_FLOWER_e */ J3DFrameCtrl::EMode_LOOP,
/* dItemNo_SEA_FLOWER_e */ J3DFrameCtrl::EMode_LOOP,
/* dItemNo_EXOTIC_FLOWER_e */ J3DFrameCtrl::EMode_LOOP,
/* dItemNo_HEROS_FLAG_e */ -1,
/* dItemNo_BIG_CATCH_FLAG_e */ -1,
/* dItemNo_BIG_SALE_FLAG_e */ J3DFrameCtrl::EMode_LOOP,
/* dItemNo_PINWHEEL_e */ J3DFrameCtrl::EMode_LOOP,
/* dItemNo_SICKLE_MOON_FLAG_e */ J3DFrameCtrl::EMode_LOOP,
/* dItemNo_SKULL_TOWER_IDOL_e */ J3DFrameCtrl::EMode_LOOP,
/* dItemNo_FOUNTAIN_IDOL_e */ J3DFrameCtrl::EMode_NONE,
/* dItemNo_POSTMAN_STATUE_e */ J3DFrameCtrl::EMode_LOOP,
/* dItemNo_SHOP_GURU_STATUE_e */ J3DFrameCtrl::EMode_LOOP,
};
if (mpBckAnm == NULL || !mpBckAnm->init(modelData, pbck, TRUE, playmode[mItemType]))
@@ -254,7 +252,7 @@ BOOL daStandItem_c::CreateHeap() {
mpBckAnm->setPlaySpeed(0.0f);
}
if (mItemNo == HEROS_FLAG || mItemNo == TAIRYO_FLAG || mItemNo == SALES_FLAG || mItemNo == RED_FLAG) {
if (mItemNo == dItemNo_HEROS_FLAG_e || mItemNo == dItemNo_BIG_CATCH_FLAG_e || mItemNo == dItemNo_BIG_SALE_FLAG_e || mItemNo == dItemNo_SICKLE_MOON_FLAG_e) {
typedef dCloth_packet_c* (*ClothFunc)(ResTIMG*, ResTIMG*, dKy_tevstr_c*, cXyz**);
ClothFunc clothFunc[] = {
@@ -272,17 +270,17 @@ BOOL daStandItem_c::CreateHeap() {
};
switch (mItemNo) {
case HEROS_FLAG:
case dItemNo_HEROS_FLAG_e:
mClothType = 0;
break;
case TAIRYO_FLAG:
case dItemNo_BIG_CATCH_FLAG_e:
mClothType = 1;
break;
case SALES_FLAG:
case dItemNo_BIG_SALE_FLAG_e:
mClothType = 2;
break;
default:
case RED_FLAG:
case dItemNo_SICKLE_MOON_FLAG_e:
mClothType = 3;
break;
}
@@ -320,7 +318,7 @@ void daStandItem_c::CreateInit() {
const char* jointName;
u16 i;
switch (mItemNo) {
case WIND_FLAG:
case dItemNo_PINWHEEL_e:
{
for (i = 0; i < mpModel->getModelData()->getJointNum(); i++) {
jointName = jointNameTab->getName(i);
@@ -333,7 +331,7 @@ void daStandItem_c::CreateInit() {
mpModel->calc();
}
break;
case WATER_STATUE:
case dItemNo_FOUNTAIN_IDOL_e:
{
for (i = 0; i < mpModel->getModelData()->getJointNum(); i++) {
jointName = jointNameTab->getName(i);
@@ -756,12 +754,12 @@ void daStandItem_c::mode_drop() {
bool daStandItem_c::_draw() {
g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
g_env_light.setLightTevColorType(mpModel, &tevStr);
if (mItemNo == WIND_FLAG)
if (mItemNo == dItemNo_PINWHEEL_e)
mDoExt_bckAnmRemove(mpModel->getModelData());
else if (mpBckAnm != NULL)
mpBckAnm->entry(mpModel->getModelData());
if (mItemNo == PRESIDENT_STATUE)
if (mItemNo == dItemNo_SHOP_GURU_STATUE_e)
dDlst_texSpecmapST(&eyePos, &tevStr, mpModel->getModelData(), 1.0f);
mDoExt_modelUpdateDL(mpModel);
@@ -805,18 +803,18 @@ static actor_method_class daStandItemMethodTable = {
};
actor_process_profile_definition g_profile_STANDITEM = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0008,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_STANDITEM,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0008,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_STANDITEM_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daStandItem_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_STANDITEM,
/* Draw Prio */ fpcDwPi_STANDITEM_e,
/* Actor SubMtd */ &daStandItemMethodTable,
/* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_daiocta.cpp
+14 -16
View File
@@ -13,8 +13,6 @@
#include "d/d_cc_d.h"
#include "d/d_jnt_hit.h"
#include "d/d_lib.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_s_play.h"
#include "d/d_snap.h"
#include "d/res/res_daiocta.h"
@@ -168,7 +166,7 @@ static void coHit_CB(fopAc_ac_c* i_this, dCcD_GObjInf*, fopAc_ac_c* i_actor, dCc
/* 00000358-000003DC .text _coHit__11daDaiocta_cFP10fopAc_ac_c */
void daDaiocta_c::_coHit(fopAc_ac_c* i_actor) {
if (i_actor != NULL && fpcM_GetName(i_actor) == PROC_BOMB) {
if (i_actor != NULL && fpcM_GetName(i_actor) == fpcNm_BOMB_e) {
daBomb_c* bomb_p = (daBomb_c *) i_actor;
if ((mMode == MODE_WAIT || mMode == MODE_DAMAGE_BOMB ||
mMode == MODE_APPEAR || mMode == MODE_DAMAGE) &&
@@ -908,7 +906,7 @@ void daDaiocta_c::modeAppearInit() {
}
#else
int auzu_parameters = 0x1100FF;
mAuzuId = fopAcM_create(PROC_Obj_Auzu, auzu_parameters, &auzu_pos, tevStr.mRoomNo);
mAuzuId = fopAcM_create(fpcNm_Obj_Auzu_e, auzu_parameters, &auzu_pos, tevStr.mRoomNo);
#endif
setEffect(dPa_name::ID_IT_SN_DO_APPSHIBUKI00);
@@ -1092,7 +1090,7 @@ void daDaiocta_c::modeDemoInit() {
/* 000028FC-00003150 .text modeDemo__11daDaiocta_cFv */
void daDaiocta_c::modeDemo() {
current.pos.y = mWaterY;
daShip_c* ship_p_1 = (daShip_c *) fopAcM_SearchByName(PROC_SHIP);
daShip_c* ship_p_1 = (daShip_c *) fopAcM_SearchByName(fpcNm_SHIP_e);
m21F4 = ship_p_1->current.pos;
m2200 = ship_p_1->current.angle;
@@ -1145,7 +1143,7 @@ void daDaiocta_c::modeDemo() {
m21F4.x += (dist / (REG12_F(1) + 60.0f)) * cM_ssin(target_angle_y);
}
daShip_c* ship_p_2 = (daShip_c *) fopAcM_SearchByName(PROC_SHIP);
daShip_c* ship_p_2 = (daShip_c *) fopAcM_SearchByName(fpcNm_SHIP_e);
ship_p_2->initStartPos(&m21F4, m2200.y);
}
@@ -1159,7 +1157,7 @@ void daDaiocta_c::modeDemo() {
cLib_chasePosXZ(&m21F4, current.pos, m2208);
cLib_addCalcAngleS2(&m2200.y, target_angle_y + 0x8000, 4, 0x800);
daShip_c* ship_p_2 = (daShip_c *) fopAcM_SearchByName(PROC_SHIP);
daShip_c* ship_p_2 = (daShip_c *) fopAcM_SearchByName(fpcNm_SHIP_e);
ship_p_2->initStartPos(&m21F4, m2200.y);
if ((current.pos - m21F4).absXZ() < 10.0f && (mpMorf->isStop() || mPrmIdx == 2)) {
@@ -1653,7 +1651,7 @@ void daDaiocta_c::createInit() {
for (int i = 0; i < ARRAY_SSIZE(mDaioctaEyePcId); i++) {
if (mEyeAlloc[i] == true) {
mDaioctaEyePcId[i] = fopAcM_createChild(
PROC_DAIOCTA_EYE, fpcM_GetID(this),
fpcNm_DAIOCTA_EYE_e, fpcM_GetID(this),
-1, &current.pos,
tevStr.mRoomNo, NULL
);
@@ -1662,7 +1660,7 @@ void daDaiocta_c::createInit() {
#if VERSION > VERSION_JPN
mAuzuId = fopAcM_create(
PROC_Obj_Auzu,
fpcNm_Obj_Auzu_e,
0x1100FF,
&current.pos,
tevStr.mRoomNo
@@ -1760,18 +1758,18 @@ static actor_method_class daDaioctaMethodTable = {
};
actor_process_profile_definition g_profile_DAIOCTA = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_DAIOCTA,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_DAIOCTA_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daDaiocta_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_DAIOCTA,
/* Draw Prio */ fpcDwPi_DAIOCTA_e,
/* Actor SubMtd */ &daDaioctaMethodTable,
/* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_daiocta_eye.cpp
+9 -11
View File
@@ -11,8 +11,6 @@
#include "d/d_bg_s_func.h"
#include "d/d_cc_d.h"
#include "d/d_lib.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/res/res_daiocta.h"
const s32 daDaiocta_Eye_c::m_heapsize = 2848;
@@ -184,7 +182,7 @@ void coHit_CB(fopAc_ac_c* i_this, dCcD_GObjInf*, fopAc_ac_c* i_actor, dCcD_GObjI
/* 00000510-000005D0 .text _coHit__15daDaiocta_Eye_cFP10fopAc_ac_c */
void daDaiocta_Eye_c::_coHit(fopAc_ac_c* i_actor) {
if (fpcM_GetName(i_actor) == PROC_BOMB) {
if (fpcM_GetName(i_actor) == fpcNm_BOMB_e) {
daBomb_c* bomb_p = (daBomb_c *) i_actor;
if (bomb_p->chk_state(daBomb_c::STATE_4)) {
if (!mbIsDead) {
@@ -461,7 +459,7 @@ void daDaiocta_Eye_c::createInit() {
mEyeScale.setall(1.0f);
if (parentActorID != fpcM_ERROR_PROCESS_ID_e) {
fopAc_ac_c* parent_p = fopAcM_SearchByID(parentActorID);
if (parent_p && fopAc_IsActor(parent_p) && fpcM_GetName(parent_p) == PROC_DAIOCTA) {
if (parent_p && fopAc_IsActor(parent_p) && fpcM_GetName(parent_p) == fpcNm_DAIOCTA_e) {
mpParentActor = (daDaiocta_c *) parent_p;
}
}
@@ -521,18 +519,18 @@ static actor_method_class daDaiocta_EyeMethodTable = {
};
actor_process_profile_definition g_profile_DAIOCTA_EYE = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_DAIOCTA_EYE,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_DAIOCTA_EYE_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daDaiocta_Eye_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_DAIOCTA_EYE,
/* Draw Prio */ fpcDwPi_DAIOCTA_EYE_e,
/* Actor SubMtd */ &daDaiocta_EyeMethodTable,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_4_e,
/* Cull Type */ fopAc_CULLBOX_4_e,
};
src/d/actor/d_a_deku_item.cpp
+8 -10
View File
@@ -7,8 +7,6 @@
#include "d/actor/d_a_deku_item.h"
#include "d/res/res_deku.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
const char daDekuItem_c::m_arcname[] = "Deku";
@@ -202,7 +200,7 @@ void daDekuItem_c::mode_getdemo_init() {
/* 00000CB8-00000D34 .text mode_getdemo_wait__12daDekuItem_cFv */
void daDekuItem_c::mode_getdemo_wait() {
if (!unk630) {
mItemPID = fopAcM_createItemForTrBoxDemo(&current.pos, dItem_DEKU_LEAF_e, -1, fopAcM_GetRoomNo(this));
mItemPID = fopAcM_createItemForTrBoxDemo(&current.pos, dItemNo_DEKU_LEAF_e, -1, fopAcM_GetRoomNo(this));
if (mItemPID != fpcM_ERROR_PROCESS_ID_e) {
dComIfGp_event_setItemPartnerId(mItemPID);
@@ -283,18 +281,18 @@ static actor_method_class daDekuItemMethodTable = {
};
actor_process_profile_definition g_profile_DEKU_ITEM = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_DEKU_ITEM,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_DEKU_ITEM_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daDekuItem_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_DEKU_ITEM,
/* Draw Prio */ fpcDwPi_DEKU_ITEM_e,
/* Actor SubMtd */ &daDekuItemMethodTable,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_demo00.cpp
+18 -20
View File
@@ -15,8 +15,6 @@
#include "d/d_item.h"
#include "d/d_kankyo.h"
#include "d/d_kankyo_demo.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_ext.h"
#include "m_Do/m_Do_graphic.h"
@@ -715,16 +713,16 @@ BOOL daDemo00_c::execute() {
}
} else if (field_0x29c == 5) {
static const u8 l_itemNo[] = {
dItem_MASTER_SWORD_1_e,
dItem_MASTER_SWORD_2_e,
dItem_MASTER_SWORD_3_e,
dItem_PEARL_DIN_e,
dItem_PEARL_FARORE_e,
dItem_PEARL_NAYRU_e,
dItem_DELIVERY_BAG_e,
dItem_SHIELD_e,
dItem_MAGIC_ARROW_e,
dItem_NONE_e,
dItemNo_MASTER_SWORD_1_e,
dItemNo_MASTER_SWORD_2_e,
dItemNo_MASTER_SWORD_3_e,
dItemNo_PEARL_DIN_e,
dItemNo_PEARL_FARORE_e,
dItemNo_PEARL_NAYRU_e,
dItemNo_DELIVERY_BAG_e,
dItemNo_SHIELD_e,
dItemNo_MAGIC_ARROW_e,
dItemNo_NONE_e,
};
dDemo_prm_data* data = demo_actor->getPrm()->getData();
JStudio::stb::TParseData_fixed<49, TValueIterator_raw<u8> > spB8(data);
@@ -732,7 +730,7 @@ BOOL daDemo00_c::execute() {
TValueIterator_raw<u8> it = spB8.begin();
int argID = *it;
JUT_ASSERT(VERSION_SELECT(797, 844, 858, 858), argID < (sizeof(l_itemNo)/sizeof(u8)));
if (l_itemNo[argID] != dItem_NONE_e) {
if (l_itemNo[argID] != dItemNo_NONE_e) {
execItemGet(l_itemNo[argID]);
}
}
@@ -849,18 +847,18 @@ static actor_method_class l_daDemo00_Method = {
};
actor_process_profile_definition g_profile_DEMO00 = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_DEMO00,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_DEMO00_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daDemo00_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_DEMO00,
/* Draw Prio */ fpcDwPi_DEMO00_e,
/* Actor SubMtd */ &l_daDemo00_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_demo_dk.cpp
+7 -9
View File
@@ -5,8 +5,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_demo_dk.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_com_inf_game.h"
#include "m_Do/m_Do_ext.h"
@@ -157,18 +155,18 @@ static actor_method_class l_daDEMO_DK_Method = {
};
actor_process_profile_definition g_profile_DEMO_DK = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_DEMO_DK,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_DEMO_DK_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(demo_dk_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_DEMO_DK,
/* Draw Prio */ fpcDwPi_DEMO_DK_e,
/* Actor SubMtd */ &l_daDEMO_DK_Method,
/* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ENV_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_demo_item.cpp
+283 -285
View File
@@ -5,8 +5,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_demo_item.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_drawlist.h"
#include "f_op/f_op_actor_mng.h"
#include "f_op/f_op_actor_mng.h"
@@ -19,262 +17,262 @@
const int daDitem_c::m_rot_time = 8*30;
u8 daDitem_c::m_effect_type[0x100] = {
0x04, // dItem_HEART_e
0x03, // dItem_GREEN_RUPEE_e
0x03, // dItem_BLUE_RUPEE_e
0x03, // dItem_YELLOW_RUPEE_e
0x03, // dItem_RED_RUPEE_e
0x03, // dItem_PURPLE_RUPEE_e
0x03, // dItem_ORANGE_RUPEE_e
DEMO_SELECT(0x01, 0x00), // dItem_HEART_PIECE_e
0x00, // dItem_HEART_CONTAINER_e
0x04, // dItem_SMALL_MAGIC_e
0x04, // dItem_LARGE_MAGIC_e
0x04, // dItem_BOMB_5_e
0x04, // dItem_BOMB_10_e
0x04, // dItem_BOMB_20_e
0x04, // dItem_BOMB_30_e
DEMO_SELECT(0x04, 0x03), // dItem_SILVER_RUPEE_e
0x04, // dItem_ARROW_10_e
0x04, // dItem_ARROW_20_e
0x04, // dItem_ARROW_30_e
0x04, // noentry19
0x04, // noentry20
0x02, // dItem_SMALL_KEY_e
0x04, // dItem_RECOVER_FAIRY_e
0x04, // noentry23
0x04, // noentry24
0x04, // noentry25
0x03, // dItem_SUB_DUN_RUPEE_e
0x04, // noentry27
0x04, // noentry28
0x04, // noentry29
0x04, // dItem_TRIPLE_HEART_e
0x01, // dItem_JOY_PENDANT_e
0x00, // dItem_TELESCOPE_e
0x00, // dItem_TINGLE_TUNER_e
0x00, // dItem_WIND_WAKER_e
0x00, // CAMERA
0x00, // dItem_SPOILS_BAG_e
0x00, // dItem_GRAPPLING_HOOK_e
0x00, // CAMERA2
0x00, // dItem_BOW_e
0x00, // dItem_POWER_BRACELETS_e
0x00, // dItem_IRON_BOOTS_e
0x00, // dItem_MAGIC_ARMOR_e
0x04, // WATER_BOOTS
0x00, // dItem_BAIT_BAG_e
0x00, // dItem_BOOMERANG_e
0x04, // BARE_HAND
0x00, // dItem_HOOKSHOT_e
0x00, // dItem_DELIVERY_BAG_e
0x00, // dItem_BOMB_BAG_e
0x03, // dItem_FUKU_e
0x00, // dItem_SKULL_HAMMER_e
0x00, // dItem_DEKU_LEAF_e
0x00, // dItem_MAGIC_ARROW_e
0x00, // dItem_LIGHT_ARROW_e
0x04, // dItem_NEW_FUKU_e
0x00, // dItem_SWORD_e
0x00, // dItem_MASTER_SWORD_1_e
0x04, // dItem_MASTER_SWORD_2_e
0x00, // dItem_SHIELD_e
0x00, // dItem_MIRROR_SHIELD_e
DEMO_SELECT(0x04, 0x00), // dItem_DROPPED_SWORD_e
0x04, // dItem_MASTER_SWORD_3_e
0x01, // KAKERA_HEART2
0x04, // noentry64
0x04, // noentry65
0x00, // dItem_PIRATES_CHARM_e
0x00, // dItem_HEROS_CHARM_e
0x04, // GRASS_BALL
0x01, // dItem_SKULL_NECKLACE_e
0x01, // dItem_BOKOBABA_SEED_e
0x01, // dItem_GOLDEN_FEATHER_e
0x01, // dItem_KNIGHTS_CREST_e
0x01, // dItem_RED_JELLY_e
0x01, // dItem_GREEN_JELLY_e
0x01, // dItem_BLUE_JELLY_e
0x01, // dItem_MAP_e
0x01, // dItem_COMPASS_e
0x00, // dItem_BOSS_KEY_e
0x04, // EMPTY_BSHIP
0x00, // dItem_EMPTY_BOTTLE_e
0x02, // dItem_RED_POTION_e
0x02, // dItem_GREEN_POTION_e
0x02, // dItem_BLUE_POTION_e
DEMO_SELECT(0x04, 0x00), // dItem_HALF_SOUP_BOTTLE_e
0x00, // dItem_SOUP_BOTTLE_e
0x02, // dItem_WATER_BOTTLE_e
0x02, // dItem_FAIRY_BOTTLE_e
0x00, // dItem_FIREFLY_BOTTLE_e
0x02, // dItem_FOREST_WATER_e
0x04, // UNK_BOTTLE_5A
0x04, // UNK_BOTTLE_5B
0x04, // UNK_BOTTLE_5C
0x04, // UNK_BOTTLE_5D
0x04, // UNK_BOTTLE_5E
0x04, // UNK_BOTTLE_5F
0x04, // UNK_BOTTLE_60
0x00, // dItem_TRIFORCE1_e
0x00, // dItem_TRIFORCE2_e
0x00, // dItem_TRIFORCE3_e
0x00, // dItem_TRIFORCE4_e
0x00, // dItem_TRIFORCE5_e
0x00, // dItem_TRIFORCE6_e
0x00, // dItem_TRIFORCE7_e
0x00, // dItem_TRIFORCE8_e
0x00, // dItem_PEARL_NAYRU_e
0x00, // dItem_PEARL_DIN_e
0x00, // dItem_PEARL_FARORE_e
0x04, // KNOWLEDGE_TF
0x04, // TACT_SONG1
0x04, // TACT_SONG2
0x04, // TACT_SONG3
0x04, // TACT_SONG4
0x04, // TACT_SONG5
0x04, // TACT_SONG6
0x04, // noentry115
0x04, // noentry116
0x04, // noentry117
0x04, // noentry118
0x04, // noentry119
0x00, // NORMAL_SAIL
0x00, // TRIFORCE_MAP1
0x00, // TRIFORCE_MAP2
0x00, // TRIFORCE_MAP3
0x00, // TRIFORCE_MAP4
0x00, // TRIFORCE_MAP5
0x00, // TRIFORCE_MAP6
0x00, // TRIFORCE_MAP7
0x00, // TRIFORCE_MAP8
0x04, // noentry129
0x02, // dItem_BIRD_BAIT_5_e
0x02, // dItem_HYOI_PEAR_e
0x04, // ESA1
0x04, // ESA2
0x04, // ESA3
0x04, // ESA4
0x04, // ESA5
0x04, // MAGIC_BEAN
0x04, // BIRD_ESA_10
0x04, // noentry139
0x02, // FLOWER_1
0x02, // FLOWER_2
0x02, // FLOWER_3
0x02, // HEROS_FLAG
0x02, // TAIRYO_FLAG
0x02, // SALES_FLAG
0x02, // WIND_FLAG
0x02, // RED_FLAG
0x02, // FOSSIL_HEAD
0x02, // WATER_STATUE
0x02, // POSTMAN_STATUE
0x02, // PRESIDENT_STATUE
0x02, // dItem_FATHER_LETTER_e
0x02, // dItem_NOTE_TO_MOM_e
0x02, // MAGYS_LETTER
0x02, // MO_LETTER
DEMO_SELECT(0x04, 0x00), // COTTAGE_PAPER
0x02, // KAISEN_PRESENT1
0x02, // KAISEN_PRESENT2
DEMO_SELECT(0x04, 0x00), // SALVAGE_ITEM1
0x04, // SALVAGE_ITEM2
0x04, // SALVAGE_ITEM3
0x04, // XXX_039
0x00, // TINGLE_STATUE1
0x00, // TINGLE_STATUE2
0x00, // TINGLE_STATUE3
0x00, // TINGLE_STATUE4
0x00, // TINGLE_STATUE5
0x00, // TINGLE_STATUE6
0x04, // noentry169
0x04, // dItem_HURRICANE_SPIN_e
0x00, // dItem_MAX_RUPEE_UP1_e
0x00, // dItem_MAX_RUPEE_UP2_e
0x00, // dItem_MAX_BOMB_UP1_e
0x00, // dItem_MAX_BOMB_UP2_e
0x00, // dItem_MAX_ARROW_UP1_e
0x00, // dItem_MAX_ARROW_UP2_e
0x04, // dItem_MAGIC_POWER_e
0x04, // dItem_MAX_MP_UP1_e
0x03, // TINCLE_RUPEE1
0x03, // TINCLE_RUPEE2
0x03, // TINCLE_RUPEE3
0x03, // TINCLE_RUPEE4
0x03, // TINCLE_RUPEE5
0x03, // TINCLE_RUPEE6
0x04, // LITHOGRAPH1
0x04, // LITHOGRAPH2
0x04, // LITHOGRAPH3
0x04, // LITHOGRAPH4
0x04, // LITHOGRAPH5
0x04, // LITHOGRAPH6
0x04, // dItem_COLLECT_MAP_64_e
0x04, // dItem_COLLECT_MAP_63_e
0x04, // dItem_COLLECT_MAP_62_e
0x00, // dItem_COLLECT_MAP_61_e
0x00, // dItem_COLLECT_MAP_60_e
0x00, // dItem_COLLECT_MAP_59_e
0x00, // dItem_COLLECT_MAP_58_e
0x00, // dItem_COLLECT_MAP_57_e
0x00, // dItem_COLLECT_MAP_56_e
0x00, // dItem_COLLECT_MAP_55_e
0x00, // dItem_COLLECT_MAP_54_e
0x00, // dItem_COLLECT_MAP_53_e
0x00, // dItem_COLLECT_MAP_52_e
0x00, // dItem_COLLECT_MAP_51_e
0x00, // dItem_COLLECT_MAP_50_e
0x00, // dItem_COLLECT_MAP_49_e
0x00, // dItem_COLLECT_MAP_48_e
0x00, // dItem_COLLECT_MAP_47_e
0x00, // dItem_COLLECT_MAP_46_e
0x00, // dItem_COLLECT_MAP_45_e
0x00, // dItem_COLLECT_MAP_44_e
0x00, // dItem_COLLECT_MAP_43_e
0x00, // dItem_COLLECT_MAP_42_e
0x00, // dItem_COLLECT_MAP_41_e
0x00, // dItem_COLLECT_MAP_40_e
0x00, // dItem_COLLECT_MAP_39_e
0x00, // dItem_COLLECT_MAP_38_e
0x00, // dItem_COLLECT_MAP_37_e
0x00, // dItem_COLLECT_MAP_36_e
0x00, // dItem_COLLECT_MAP_35_e
0x00, // dItem_COLLECT_MAP_34_e
0x00, // dItem_COLLECT_MAP_33_e
0x00, // dItem_COLLECT_MAP_32_e
0x00, // dItem_COLLECT_MAP_31_e
0x00, // dItem_COLLECT_MAP_30_e
0x00, // dItem_COLLECT_MAP_29_e
0x00, // dItem_COLLECT_MAP_28_e
0x00, // dItem_COLLECT_MAP_27_e
0x00, // dItem_COLLECT_MAP_26_e
0x00, // dItem_COLLECT_MAP_25_e
0x00, // dItem_COLLECT_MAP_24_e
0x00, // dItem_COLLECT_MAP_23_e
0x00, // dItem_COLLECT_MAP_22_e
0x00, // dItem_COLLECT_MAP_21_e
0x00, // dItem_COLLECT_MAP_20_e
0x00, // dItem_COLLECT_MAP_19_e
0x00, // dItem_COLLECT_MAP_18_e
0x00, // dItem_COLLECT_MAP_17_e
0x00, // dItem_COLLECT_MAP_16_e
0x00, // dItem_COLLECT_MAP_15_e
0x00, // dItem_COLLECT_MAP_14_e
0x00, // dItem_COLLECT_MAP_13_e
0x00, // dItem_COLLECT_MAP_12_e
0x00, // dItem_COLLECT_MAP_11_e
0x00, // dItem_COLLECT_MAP_10_e
0x00, // dItem_COLLECT_MAP_09_e
0x00, // dItem_COLLECT_MAP_08_e
0x00, // dItem_COLLECT_MAP_07_e
0x00, // dItem_COLLECT_MAP_06_e
0x00, // dItem_COLLECT_MAP_05_e
0x00, // dItem_COLLECT_MAP_04_e
0x00, // dItem_COLLECT_MAP_03_e
0x00, // dItem_COLLECT_MAP_02_e
0x00, // dItem_COLLECT_MAP_01_e
0x04, // dItem_NONE_e
0x04, // dItemNo_HEART_e
0x03, // dItemNo_GREEN_RUPEE_e
0x03, // dItemNo_BLUE_RUPEE_e
0x03, // dItemNo_YELLOW_RUPEE_e
0x03, // dItemNo_RED_RUPEE_e
0x03, // dItemNo_PURPLE_RUPEE_e
0x03, // dItemNo_ORANGE_RUPEE_e
DEMO_SELECT(0x01, 0x00), // dItemNo_HEART_PIECE_e
0x00, // dItemNo_HEART_CONTAINER_e
0x04, // dItemNo_SMALL_MAGIC_e
0x04, // dItemNo_LARGE_MAGIC_e
0x04, // dItemNo_BOMB_5_e
0x04, // dItemNo_BOMB_10_e
0x04, // dItemNo_BOMB_20_e
0x04, // dItemNo_BOMB_30_e
DEMO_SELECT(0x04, 0x03), // dItemNo_SILVER_RUPEE_e
0x04, // dItemNo_ARROW_10_e
0x04, // dItemNo_ARROW_20_e
0x04, // dItemNo_ARROW_30_e
0x04, // dItemNo_NOENTRY_19_e
0x04, // dItemNo_NOENTRY_20_e
0x02, // dItemNo_SMALL_KEY_e
0x04, // dItemNo_RECOVER_FAIRY_e
0x04, // dItemNo_NOENTRY_23_e
0x04, // dItemNo_NOENTRY_24_e
0x04, // dItemNo_NOENTRY_25_e
0x03, // dItemNo_SUB_DUN_RUPEE_e
0x04, // dItemNo_NOENTRY_27_e
0x04, // dItemNo_NOENTRY_28_e
0x04, // dItemNo_NOENTRY_29_e
0x04, // dItemNo_TRIPLE_HEART_e
0x01, // dItemNo_JOY_PENDANT_e
0x00, // dItemNo_TELESCOPE_e
0x00, // dItemNo_TINGLE_TUNER_e
0x00, // dItemNo_WIND_WAKER_e
0x00, // dItemNo_PICTO_BOX_e
0x00, // dItemNo_SPOILS_BAG_e
0x00, // dItemNo_GRAPPLING_HOOK_e
0x00, // dItemNo_DELUXE_PICTO_BOX_e
0x00, // dItemNo_BOW_e
0x00, // dItemNo_POWER_BRACELETS_e
0x00, // dItemNo_IRON_BOOTS_e
0x00, // dItemNo_MAGIC_ARMOR_e
0x04, // dItemNo_WATER_BOOTS_e
0x00, // dItemNo_BAIT_BAG_e
0x00, // dItemNo_BOOMERANG_e
0x04, // dItemNo_BARE_HAND_e
0x00, // dItemNo_HOOKSHOT_e
0x00, // dItemNo_DELIVERY_BAG_e
0x00, // dItemNo_BOMB_BAG_e
0x03, // dItemNo_FUKU_e
0x00, // dItemNo_SKULL_HAMMER_e
0x00, // dItemNo_DEKU_LEAF_e
0x00, // dItemNo_MAGIC_ARROW_e
0x00, // dItemNo_LIGHT_ARROW_e
0x04, // dItemNo_NEW_FUKU_e
0x00, // dItemNo_SWORD_e
0x00, // dItemNo_MASTER_SWORD_1_e
0x04, // dItemNo_MASTER_SWORD_2_e
0x00, // dItemNo_SHIELD_e
0x00, // dItemNo_MIRROR_SHIELD_e
DEMO_SELECT(0x04, 0x00), // dItemNo_DROPPED_SWORD_e
0x04, // dItemNo_MASTER_SWORD_3_e
0x01, // dItemNo_HEART_PIECE_ALT_e
0x04, // dItemNo_NOENTRY_64_e
0x04, // dItemNo_NOENTRY_65_e
0x00, // dItemNo_PIRATES_CHARM_e
0x00, // dItemNo_HEROS_CHARM_e
0x04, // dItemNo_GRASS_BALL_e
0x01, // dItemNo_SKULL_NECKLACE_e
0x01, // dItemNo_BOKOBABA_SEED_e
0x01, // dItemNo_GOLDEN_FEATHER_e
0x01, // dItemNo_KNIGHTS_CREST_e
0x01, // dItemNo_RED_JELLY_e
0x01, // dItemNo_GREEN_JELLY_e
0x01, // dItemNo_BLUE_JELLY_e
0x01, // dItemNo_MAP_e
0x01, // dItemNo_COMPASS_e
0x00, // dItemNo_BOSS_KEY_e
0x04, // dItemNo_EMPTY_BSHIP_e
0x00, // dItemNo_EMPTY_BOTTLE_e
0x02, // dItemNo_RED_POTION_e
0x02, // dItemNo_GREEN_POTION_e
0x02, // dItemNo_BLUE_POTION_e
DEMO_SELECT(0x04, 0x00), // dItemNo_HALF_SOUP_BOTTLE_e
0x00, // dItemNo_SOUP_BOTTLE_e
0x02, // dItemNo_WATER_BOTTLE_e
0x02, // dItemNo_FAIRY_BOTTLE_e
0x00, // dItemNo_FIREFLY_BOTTLE_e
0x02, // dItemNo_FOREST_WATER_e
0x04, // dItemNo_UNK_BOTTLE_5A_e
0x04, // dItemNo_UNK_BOTTLE_5B_e
0x04, // dItemNo_UNK_BOTTLE_5C_e
0x04, // dItemNo_UNK_BOTTLE_5D_e
0x04, // dItemNo_UNK_BOTTLE_5E_e
0x04, // dItemNo_UNK_BOTTLE_5F_e
0x04, // dItemNo_UNK_BOTTLE_60_e
0x00, // dItemNo_TRIFORCE1_e
0x00, // dItemNo_TRIFORCE2_e
0x00, // dItemNo_TRIFORCE3_e
0x00, // dItemNo_TRIFORCE4_e
0x00, // dItemNo_TRIFORCE5_e
0x00, // dItemNo_TRIFORCE6_e
0x00, // dItemNo_TRIFORCE7_e
0x00, // dItemNo_TRIFORCE8_e
0x00, // dItemNo_PEARL_NAYRU_e
0x00, // dItemNo_PEARL_DIN_e
0x00, // dItemNo_PEARL_FARORE_e
0x04, // dItemNo_KNOWLEDGE_TF_e
0x04, // dItemNo_WINDS_REQUIEM_e
0x04, // dItemNo_BALLAD_OF_GALES_e
0x04, // dItemNo_COMMAND_MELODY_e
0x04, // dItemNo_EARTH_GODS_LYRIC_e
0x04, // dItemNo_WIND_GODS_ARIA_e
0x04, // dItemNo_SONG_OF_PASSING_e
0x04, // dItemNo_NOENTRY_115_e
0x04, // dItemNo_NOENTRY_116_e
0x04, // dItemNo_NOENTRY_117_e
0x04, // dItemNo_NOENTRY_118_e
0x04, // dItemNo_NOENTRY_119_e
0x00, // dItemNo_SAIL_e
0x00, // dItemNo_TRIFORCE_MAP_1_e
0x00, // dItemNo_TRIFORCE_MAP_2_e
0x00, // dItemNo_TRIFORCE_MAP_3_e
0x00, // dItemNo_TRIFORCE_MAP_4_e
0x00, // dItemNo_TRIFORCE_MAP_5_e
0x00, // dItemNo_TRIFORCE_MAP_6_e
0x00, // dItemNo_TRIFORCE_MAP_7_e
0x00, // dItemNo_TRIFORCE_MAP_8_e
0x04, // dItemNo_NOENTRY_129_e
0x02, // dItemNo_BIRD_BAIT_5_e
0x02, // dItemNo_HYOI_PEAR_e
0x04, // dItemNo_ESA_1_e
0x04, // dItemNo_ESA_2_e
0x04, // dItemNo_ESA_3_e
0x04, // dItemNo_ESA_4_e
0x04, // dItemNo_ESA_5_e
0x04, // dItemNo_MAGIC_BEAN_e
0x04, // dItemNo_BIRD_ESA_10_e
0x04, // dItemNo_NOENTRY_139_e
0x02, // dItemNo_TOWN_FLOWER_e
0x02, // dItemNo_SEA_FLOWER_e
0x02, // dItemNo_EXOTIC_FLOWER_e
0x02, // dItemNo_HEROS_FLAG_e
0x02, // dItemNo_BIG_CATCH_FLAG_e
0x02, // dItemNo_BIG_SALE_FLAG_e
0x02, // dItemNo_PINWHEEL_e
0x02, // dItemNo_SICKLE_MOON_FLAG_e
0x02, // dItemNo_SKULL_TOWER_IDOL_e
0x02, // dItemNo_FOUNTAIN_IDOL_e
0x02, // dItemNo_POSTMAN_STATUE_e
0x02, // dItemNo_SHOP_GURU_STATUE_e
0x02, // dItemNo_FATHER_LETTER_e
0x02, // dItemNo_NOTE_TO_MOM_e
0x02, // dItemNo_MAGGIES_LETTER_e
0x02, // dItemNo_MOBLINS_LETTER_e
DEMO_SELECT(0x04, 0x00), // dItemNo_CABANA_DEED_e
0x02, // dItemNo_COMPLIMENTARY_ID_e
0x02, // dItemNo_FILL_UP_COUPON_e
DEMO_SELECT(0x04, 0x00), // dItemNo_LEGENDARY_PICTOGRAPH_e
0x04, // dItemNo_SALVAGE_ITEM_2_e
0x04, // dItemNo_SALVAGE_ITEM_3_e
0x04, // dItemNo_XXX_039_e
0x00, // dItemNo_TINGLE_STATUE_1_e
0x00, // dItemNo_TINGLE_STATUE_2_e
0x00, // dItemNo_TINGLE_STATUE_3_e
0x00, // dItemNo_TINGLE_STATUE_4_e
0x00, // dItemNo_TINGLE_STATUE_5_e
0x00, // dItemNo_TINGLE_STATUE_6_e
0x04, // dItemNo_NOENTRY_169_e
0x04, // dItemNo_HURRICANE_SPIN_e
0x00, // dItemNo_MAX_RUPEE_UP1_e
0x00, // dItemNo_MAX_RUPEE_UP2_e
0x00, // dItemNo_MAX_BOMB_UP1_e
0x00, // dItemNo_MAX_BOMB_UP2_e
0x00, // dItemNo_MAX_ARROW_UP1_e
0x00, // dItemNo_MAX_ARROW_UP2_e
0x04, // dItemNo_MAGIC_POWER_e
0x04, // dItemNo_MAX_MP_UP1_e
0x03, // dItemNo_TINGLE_RUPEE_1_e
0x03, // dItemNo_TINGLE_RUPEE_2_e
0x03, // dItemNo_TINGLE_RUPEE_3_e
0x03, // dItemNo_TINGLE_RUPEE_4_e
0x03, // dItemNo_TINGLE_RUPEE_5_e
0x03, // dItemNo_TINGLE_RUPEE_6_e
0x04, // dItemNo_LITHOGRAPH_1_e
0x04, // dItemNo_LITHOGRAPH_2_e
0x04, // dItemNo_LITHOGRAPH_3_e
0x04, // dItemNo_LITHOGRAPH_4_e
0x04, // dItemNo_LITHOGRAPH_5_e
0x04, // dItemNo_LITHOGRAPH_6_e
0x04, // dItemNo_COLLECT_MAP_64_e
0x04, // dItemNo_COLLECT_MAP_63_e
0x04, // dItemNo_COLLECT_MAP_62_e
0x00, // dItemNo_COLLECT_MAP_61_e
0x00, // dItemNo_COLLECT_MAP_60_e
0x00, // dItemNo_COLLECT_MAP_59_e
0x00, // dItemNo_COLLECT_MAP_58_e
0x00, // dItemNo_COLLECT_MAP_57_e
0x00, // dItemNo_COLLECT_MAP_56_e
0x00, // dItemNo_COLLECT_MAP_55_e
0x00, // dItemNo_COLLECT_MAP_54_e
0x00, // dItemNo_COLLECT_MAP_53_e
0x00, // dItemNo_COLLECT_MAP_52_e
0x00, // dItemNo_COLLECT_MAP_51_e
0x00, // dItemNo_COLLECT_MAP_50_e
0x00, // dItemNo_COLLECT_MAP_49_e
0x00, // dItemNo_COLLECT_MAP_48_e
0x00, // dItemNo_COLLECT_MAP_47_e
0x00, // dItemNo_COLLECT_MAP_46_e
0x00, // dItemNo_COLLECT_MAP_45_e
0x00, // dItemNo_COLLECT_MAP_44_e
0x00, // dItemNo_COLLECT_MAP_43_e
0x00, // dItemNo_COLLECT_MAP_42_e
0x00, // dItemNo_COLLECT_MAP_41_e
0x00, // dItemNo_COLLECT_MAP_40_e
0x00, // dItemNo_COLLECT_MAP_39_e
0x00, // dItemNo_COLLECT_MAP_38_e
0x00, // dItemNo_COLLECT_MAP_37_e
0x00, // dItemNo_COLLECT_MAP_36_e
0x00, // dItemNo_COLLECT_MAP_35_e
0x00, // dItemNo_COLLECT_MAP_34_e
0x00, // dItemNo_COLLECT_MAP_33_e
0x00, // dItemNo_COLLECT_MAP_32_e
0x00, // dItemNo_COLLECT_MAP_31_e
0x00, // dItemNo_COLLECT_MAP_30_e
0x00, // dItemNo_COLLECT_MAP_29_e
0x00, // dItemNo_COLLECT_MAP_28_e
0x00, // dItemNo_COLLECT_MAP_27_e
0x00, // dItemNo_COLLECT_MAP_26_e
0x00, // dItemNo_COLLECT_MAP_25_e
0x00, // dItemNo_COLLECT_MAP_24_e
0x00, // dItemNo_COLLECT_MAP_23_e
0x00, // dItemNo_COLLECT_MAP_22_e
0x00, // dItemNo_COLLECT_MAP_21_e
0x00, // dItemNo_COLLECT_MAP_20_e
0x00, // dItemNo_COLLECT_MAP_19_e
0x00, // dItemNo_COLLECT_MAP_18_e
0x00, // dItemNo_COLLECT_MAP_17_e
0x00, // dItemNo_COLLECT_MAP_16_e
0x00, // dItemNo_COLLECT_MAP_15_e
0x00, // dItemNo_COLLECT_MAP_14_e
0x00, // dItemNo_COLLECT_MAP_13_e
0x00, // dItemNo_COLLECT_MAP_12_e
0x00, // dItemNo_COLLECT_MAP_11_e
0x00, // dItemNo_COLLECT_MAP_10_e
0x00, // dItemNo_COLLECT_MAP_09_e
0x00, // dItemNo_COLLECT_MAP_08_e
0x00, // dItemNo_COLLECT_MAP_07_e
0x00, // dItemNo_COLLECT_MAP_06_e
0x00, // dItemNo_COLLECT_MAP_05_e
0x00, // dItemNo_COLLECT_MAP_04_e
0x00, // dItemNo_COLLECT_MAP_03_e
0x00, // dItemNo_COLLECT_MAP_02_e
0x00, // dItemNo_COLLECT_MAP_01_e
0x04, // dItemNo_NONE_e
};
/* 000000EC-00000320 .text setParticle__9daDitem_cFv */
@@ -378,24 +376,24 @@ void daDitem_c::set_pos() {
/* 000006E4-00000760 .text anim_control__9daDitem_cFv */
void daDitem_c::anim_control() {
switch (m_itemNo) {
case EMPTY_BSHIP:
case dItem_EMPTY_BOTTLE_e:
case dItem_RED_POTION_e:
case dItem_GREEN_POTION_e:
case dItem_BLUE_POTION_e:
case dItem_HALF_SOUP_BOTTLE_e:
case dItem_SOUP_BOTTLE_e:
case dItem_WATER_BOTTLE_e:
case dItem_FAIRY_BOTTLE_e:
case dItem_FIREFLY_BOTTLE_e:
case dItem_FOREST_WATER_e:
case UNK_BOTTLE_5A:
case UNK_BOTTLE_5B:
case UNK_BOTTLE_5C:
case UNK_BOTTLE_5D:
case UNK_BOTTLE_5E:
case UNK_BOTTLE_5F:
case UNK_BOTTLE_60:
case dItemNo_EMPTY_BSHIP_e:
case dItemNo_EMPTY_BOTTLE_e:
case dItemNo_RED_POTION_e:
case dItemNo_GREEN_POTION_e:
case dItemNo_BLUE_POTION_e:
case dItemNo_HALF_SOUP_BOTTLE_e:
case dItemNo_SOUP_BOTTLE_e:
case dItemNo_WATER_BOTTLE_e:
case dItemNo_FAIRY_BOTTLE_e:
case dItemNo_FIREFLY_BOTTLE_e:
case dItemNo_FOREST_WATER_e:
case dItemNo_UNK_BOTTLE_5A_e:
case dItemNo_UNK_BOTTLE_5B_e:
case dItemNo_UNK_BOTTLE_5C_e:
case dItemNo_UNK_BOTTLE_5D_e:
case dItemNo_UNK_BOTTLE_5E_e:
case dItemNo_UNK_BOTTLE_5F_e:
case dItemNo_UNK_BOTTLE_60_e:
if (m_timer > 30) {
animPlay(1.0f, 1.0f, 1.0f, 1.0f, 1.0f);
}
@@ -428,7 +426,7 @@ void daDitem_c::set_mtx() {
/* 00000880-000008F0 .text settingBeforeDraw__9daDitem_cFv */
void daDitem_c::settingBeforeDraw() {
if (isBomb(m_itemNo) || m_itemNo == dItem_BOMB_BAG_e || m_itemNo == dItem_SKULL_HAMMER_e || m_itemNo == dItem_SMALL_KEY_e) {
if (isBomb(m_itemNo) || m_itemNo == dItemNo_BOMB_BAG_e || m_itemNo == dItemNo_SKULL_HAMMER_e || m_itemNo == dItemNo_SMALL_KEY_e) {
dDlst_texSpecmapST(&eyePos, &tevStr, mpModel->getModelData(), 1.0f);
}
}
@@ -460,7 +458,7 @@ cPhs_State daDitem_c::create() {
char* arcName = dItem_data::getArcname(m_itemNo);
if (dItem_data::getBmdIdx(m_itemNo) == -1 || arcName == NULL) {
m_itemNo = dItem_GREEN_RUPEE_e;
m_itemNo = dItemNo_GREEN_RUPEE_e;
}
cPhs_State phase_state = dComIfG_resLoad(&mPhs, dItem_data::getArcname(m_itemNo));
@@ -541,18 +539,18 @@ static actor_method_class l_daDitem_Method = {
};
actor_process_profile_definition g_profile_Demo_Item = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_Demo_Item,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Demo_Item_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daDitem_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_Demo_Item,
/* Draw Prio */ fpcDwPi_Demo_Item_e,
/* Actor SubMtd */ &l_daDitem_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_demo_kmm.cpp
+7 -9
View File
@@ -5,8 +5,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_demo_kmm.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_com_inf_game.h"
#include "m_Do/m_Do_ext.h"
@@ -129,18 +127,18 @@ static actor_method_class l_daDemo_Kmm_Method = {
};
actor_process_profile_definition g_profile_DEMO_KMM = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_DEMO_KMM,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_DEMO_KMM_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daDemo_Kmm_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_DEMO_KMM,
/* Draw Prio */ fpcDwPi_DEMO_KMM_e,
/* Actor SubMtd */ &l_daDemo_Kmm_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_6_e,
/* Cull Type */ fopAc_CULLBOX_6_e,
};
src/d/actor/d_a_disappear.cpp
+10 -12
View File
@@ -7,8 +7,6 @@
#include "d/actor/d_a_disappear.h"
#include "f_op/f_op_actor.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_com_inf_game.h"
#include "d/d_s_play.h"
@@ -33,9 +31,9 @@ static BOOL daDisappear_Execute(disappear_class* i_this) {
// Special type for Keese (ki) spawned in the Puppet Ganon fight.
// This also seems to be used by several other enemies, such as Molgera's spawn.
static u32 ki_item_d[] = {
dItem_HEART_e,
dItem_LARGE_MAGIC_e,
dItem_ARROW_10_e,
dItemNo_HEART_e,
dItemNo_LARGE_MAGIC_e,
dItemNo_ARROW_10_e,
};
if (dropType < daDisItem_HEART_e + (int)ARRAY_SIZE(ki_item_d)) {
fopAcM_createItem(&i_this->current.pos, ki_item_d[dropType - daDisItem_HEART_e], -1, -1, daItemType_0_e, NULL, daItemAct_4_e);
@@ -125,18 +123,18 @@ static actor_method_class l_daDisappear_Method = {
};
actor_process_profile_definition g_profile_DISAPPEAR = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_DISAPPEAR,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_DISAPPEAR_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(disappear_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_DISAPPEAR,
/* Draw Prio */ fpcDwPi_DISAPPEAR_e,
/* Actor SubMtd */ &l_daDisappear_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_dk.cpp
+8 -10
View File
@@ -9,11 +9,9 @@
#include "d/d_com_inf_game.h"
#include "d/d_s_play.h"
#include "m_Do/m_Do_ext.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "f_op/f_op_actor_mng.h"
daDk_HIO_c l_HIO;
static daDk_HIO_c l_HIO;
/* 000000EC-00000130 .text __ct__10daDk_HIO_cFv */
daDk_HIO_c::daDk_HIO_c() {
@@ -408,18 +406,18 @@ static actor_method_class l_daDk_Method = {
};
actor_process_profile_definition g_profile_DK = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_DK,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_DK_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(dk_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_DK,
/* Draw Prio */ fpcDwPi_DK_e,
/* Actor SubMtd */ &l_daDk_Method,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_door10.cpp
+7 -9
View File
@@ -5,8 +5,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_door10.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_com_inf_game.h"
#include "d/res/res_doorbs.h"
@@ -881,18 +879,18 @@ static actor_method_class l_daDoor10_Method = {
};
actor_process_profile_definition g_profile_DOOR10 = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_DOOR10,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_DOOR10_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daDoor10_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_DOOR10,
/* Draw Prio */ fpcDwPi_DOOR10_e,
/* Actor SubMtd */ &l_daDoor10_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_6_e,
/* Cull Type */ fopAc_CULLBOX_6_e,
};
src/d/actor/d_a_door12.cpp
+7 -9
View File
@@ -7,8 +7,6 @@
#include "d/actor/d_a_door12.h"
#include "d/actor/d_a_player.h"
#include "d/res/res_door12.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
@@ -907,18 +905,18 @@ static actor_method_class l_daDoor12_Method = {
};
actor_process_profile_definition g_profile_DOOR12 = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_DOOR12,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_DOOR12_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daDoor12_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_DOOR12,
/* Draw Prio */ fpcDwPi_DOOR12_e,
/* Actor SubMtd */ &l_daDoor12_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_6_e,
/* Cull Type */ fopAc_CULLBOX_6_e,
};
src/d/actor/d_a_dr.cpp
+7 -9
View File
@@ -7,8 +7,6 @@
#include "d/actor/d_a_dr.h"
#include "d/res/res_dr.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "m_Do/m_Do_ext.h"
#include "m_Do/m_Do_mtx.h"
#include "m_Do/m_Do_hostIO.h"
@@ -276,18 +274,18 @@ static actor_method_class l_daDr_Method = {
};
actor_process_profile_definition g_profile_DR = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_DR,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_DR_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(dr_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_DR,
/* Draw Prio */ fpcDwPi_DR_e,
/* Actor SubMtd */ &l_daDr_Method,
/* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_dr2.cpp
+9 -11
View File
@@ -7,8 +7,6 @@
#include "d/actor/d_a_dr2.h"
#include "d/res/res_dr2.h"
#include "m_Do/m_Do_ext.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_bg_w.h"
#include "d/d_s_play.h"
#include "d/actor/d_a_player.h"
@@ -187,7 +185,7 @@ static BOOL daDr2_Draw(dr2_class* i_this) {
/* 000006D4-00000720 .text s_a_d_sub__FPvPv */
void* s_a_d_sub(void* ac1, void* ac2) {
UNUSED(ac2);
if (fopAcM_IsActor(ac1) && fopAcM_GetName(ac1) == PROC_BTD) {
if (fopAcM_IsActor(ac1) && fopAcM_GetName(ac1) == fpcNm_BTD_e) {
return ac1;
}
return NULL;
@@ -804,7 +802,7 @@ static cPhs_State daDr2_Create(fopAc_ac_c* a_this) {
params->base.parameters = 0x511;
params->room_no = a_this->current.roomNo;
i_this->unk_3FC = fopAcM_Create(PROC_KUI, NULL, params);
i_this->unk_3FC = fopAcM_Create(fpcNm_KUI_e, NULL, params);
i_this->unk_4A8.x = a_this->home.pos.x;
i_this->unk_4A8.y = a_this->home.pos.y + REG0_F(7) - 50.0f;
i_this->unk_4A8.z = a_this->home.pos.z;
@@ -821,18 +819,18 @@ static actor_method_class l_daDr2_Method = {
};
actor_process_profile_definition g_profile_DR2 = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_DR2,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_DR2_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(dr2_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_DR2,
/* Draw Prio */ fpcDwPi_DR2_e,
/* Actor SubMtd */ &l_daDr2_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_dummy.cpp
+7 -9
View File
@@ -5,8 +5,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_dummy.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_mtx.h"
@@ -87,18 +85,18 @@ namespace daDummy {
}
actor_process_profile_definition g_profile_Dummy = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_Dummy,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Dummy_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daDummy::Act_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_Dummy,
/* Draw Prio */ fpcDwPi_Dummy_e,
/* Actor SubMtd */ &daDummy::Mthd_Table,
/* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_ep.cpp
+8 -10
View File
@@ -6,8 +6,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_ep.h"
#include "d/res/res_ep.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_com_inf_game.h"
@@ -271,7 +269,7 @@ void ep_move(ep_class* i_this) {
if (hitObj != NULL && hitObj->ChkAtType(0x600000)) {
fopAc_ac_c* ac = hitObj->GetAc();
if (fopAcM_GetName(ac) == PROC_BDK) {
if (fopAcM_GetName(ac) == fpcNm_BDK_e) {
i_this->m7DC = ac->shape_angle.y;
} else {
i_this->m7DC = player->shape_angle.y;
@@ -711,18 +709,18 @@ static actor_method_class l_daEp_Method = {
};
actor_process_profile_definition g_profile_EP = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_EP,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_EP_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(ep_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_EP,
/* Draw Prio */ fpcDwPi_EP_e,
/* Actor SubMtd */ &l_daEp_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_esa.cpp
+8 -10
View File
@@ -11,8 +11,6 @@
#include "d/d_bg_s_lin_chk.h"
#include "d/d_s_play.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_bg_s_func.h"
#include "d/res/res_link.h"
#include "f_op/f_op_actor_mng.h"
@@ -268,7 +266,7 @@ static cPhs_State daEsa_Create(fopAc_ac_c* i_actor) {
params->base.angle.y = i_this->current.angle.y;
params->base.angle.z = cM_rndF(65536.0f);
params->base.parameters = 0x000000FF;
fpcM_Create(PROC_ESA, 0, params);
fpcM_Create(fpcNm_ESA_e, 0, params);
}
}
}
@@ -291,18 +289,18 @@ static actor_method_class l_daEsa_Method = {
};
actor_process_profile_definition g_profile_ESA = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_ESA,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_ESA_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(esa_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_ESA,
/* Draw Prio */ fpcDwPi_ESA_e,
/* Actor SubMtd */ &l_daEsa_Method,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_fallrock.cpp
+7 -9
View File
@@ -7,8 +7,6 @@
#include "d/actor/d_a_fallrock.h"
#include "d/res/res_always.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
#include "f_op/f_op_actor_mng.h"
#include "f_op/f_op_kankyo_mng.h"
@@ -300,18 +298,18 @@ static actor_method_class l_daFallRock_Method = {
};
actor_process_profile_definition g_profile_FallRock = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_FallRock,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_FallRock_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daFallRock_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_FallRock,
/* Draw Prio */ fpcDwPi_FallRock_e,
/* Actor SubMtd */ &l_daFallRock_Method,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_fallrock_tag.cpp
+7 -9
View File
@@ -5,8 +5,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_fallrock_tag.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
/* 00000078-00000080 .text daFallRockTag_Draw__FP15daFallRockTag_c */
static BOOL daFallRockTag_Draw(daFallRockTag_c*) {
@@ -52,18 +50,18 @@ static actor_method_class l_daFallRockTag_Method = {
};
actor_process_profile_definition g_profile_TagRock = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_TagRock,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_TagRock_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daFallRockTag_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_TagRock,
/* Draw Prio */ fpcDwPi_TagRock_e,
/* Actor SubMtd */ &l_daFallRockTag_Method,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_fan.cpp
+8 -10
View File
@@ -11,8 +11,6 @@
#include "f_op/f_op_kankyo_mng.h"
#include "d/d_com_inf_game.h"
#include "d/d_level_se.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "m_Do/m_Do_mtx.h"
#include "JSystem/JUtility/JUTAssert.h"
@@ -132,7 +130,7 @@ BOOL daFan_c::Create() {
}
mModel->calc();
mWindSePId = fopKyM_create(PROC_LEVEL_SE, JA_SE_OBJ_WIND_TAG, &eyePos);
mWindSePId = fopKyM_create(fpcNm_LEVEL_SE_e, JA_SE_OBJ_WIND_TAG, &eyePos);
return TRUE;
}
@@ -296,18 +294,18 @@ static actor_method_class daFanMethodTable = {
};
actor_process_profile_definition g_profile_FAN = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_FAN,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_FAN_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daFan_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_FAN,
/* Draw Prio */ fpcDwPi_FAN_e,
/* Actor SubMtd */ &daFanMethodTable,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_ff.cpp
+8 -10
View File
@@ -8,8 +8,6 @@
#include "d/actor/d_a_player.h"
#include "d/d_bg_s_gnd_chk.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_s_play.h"
#include "m_Do/m_Do_lib.h"
#include "d/res/res_ff.h"
@@ -306,7 +304,7 @@ static cPhs_State daFf_Create(fopAc_ac_c* i_this) {
pfVar4->base.angle.y = 0;
pfVar4->base.angle.x = 0;
pfVar4->base.parameters = fopAcM_GetParam(a_this);
fopAcM_create(PROC_FF, NULL, pfVar4);
fopAcM_create(fpcNm_FF_e, NULL, pfVar4);
}
}
a_this->mbNoUseGroundY = fopAcM_GetParam(a_this) >> 8;
@@ -363,18 +361,18 @@ static actor_method_class l_daFf_Method = {
};
actor_process_profile_definition g_profile_FF = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_FF,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_FF_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(ff_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_FF,
/* Draw Prio */ fpcDwPi_FF_e,
/* Actor SubMtd */ &l_daFf_Method,
/* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_fganon.cpp
+25 -27
View File
@@ -5,8 +5,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_fganon.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "JSystem/JUtility/JUTReport.h"
#include "d/actor/d_a_boko.h"
#include "d/actor/d_a_mant.h"
@@ -23,7 +21,7 @@
fganon_class* master;
u8 hio_set;
daFganon_HIO_c l_HIO;
static daFganon_HIO_c l_HIO;
/* 000000EC-000001A0 .text __ct__14daFganon_HIO_cFv */
daFganon_HIO_c::daFganon_HIO_c() {
@@ -572,7 +570,7 @@ void tama_set(fganon_class* i_this) {
void mahou_set(fganon_class* i_this) {
fopAc_ac_c* a_this = &i_this->actor;
for (int i = 0; i < 8; i++) {
fopAcM_create(PROC_FGMAHOU, i, &i_this->m664, fopAcM_GetRoomNo(a_this));
fopAcM_create(fpcNm_FGMAHOU_e, i, &i_this->m664, fopAcM_GetRoomNo(a_this));
}
i_this->m670 = 0;
}
@@ -699,7 +697,7 @@ void spinattack2(fganon_class* i_this) {
i_this->mMode = 1;
if (i_this->m68F == 0) {
for (int i = 1; i < 5; i++) {
fopAcM_create(PROC_FGANON, (i * 16) | 3, &a_this->current.pos, fopAcM_GetRoomNo(a_this));
fopAcM_create(fpcNm_FGANON_e, (i * 16) | 3, &a_this->current.pos, fopAcM_GetRoomNo(a_this));
}
}
}
@@ -1033,7 +1031,7 @@ void fail(fganon_class* i_this) {
kieru_brk(i_this, 2);
i_this->m3A4[0] = 10;
i_this->mMode = 4;
i_this->mBokoID = fopAcM_create(PROC_BOKO, daBoko_c::Type_PGANON_SWORD_e, &a_this->current.pos, fopAcM_GetRoomNo(a_this));
i_this->mBokoID = fopAcM_create(fpcNm_BOKO_e, daBoko_c::Type_PGANON_SWORD_e, &a_this->current.pos, fopAcM_GetRoomNo(a_this));
}
break;
}
@@ -1065,12 +1063,12 @@ void standby(fganon_class* i_this) {
switch(i_this->mMode) {
case -1: {
if (i_this->m2BC == 2) {
if (!dComIfGs_checkGetItem(dItem_LIGHT_ARROW_e)) {
if (!dComIfGs_checkGetItem(dItemNo_LIGHT_ARROW_e)) {
a_this->current.pos.y = -20000.0f;
break;
}
}
else if ((i_this->m2BC == 1) && dComIfGs_checkGetItem(dItem_LIGHT_ARROW_e)) {
else if ((i_this->m2BC == 1) && dComIfGs_checkGetItem(dItemNo_LIGHT_ARROW_e)) {
a_this->current.pos.y = -20000.0f;
break;
}
@@ -1273,7 +1271,7 @@ void last_end(fganon_class* i_this) {
case 4: {
if (i_this->m3A4[1] <= 4) {
if (i_this->m3A4[1] == 4) {
i_this->mBokoID = fopAcM_create(PROC_BOKO, daBoko_c::Type_PGANON_SWORD_e, &a_this->current.pos, fopAcM_GetRoomNo(a_this));
i_this->mBokoID = fopAcM_create(fpcNm_BOKO_e, daBoko_c::Type_PGANON_SWORD_e, &a_this->current.pos, fopAcM_GetRoomNo(a_this));
}
daBoko_c* boko = (daBoko_c*)fopAcM_SearchByID(i_this->mBokoID);
if (boko != NULL) {
@@ -1396,7 +1394,7 @@ void damage_check(fganon_class* i_this) {
return;
}
if (atInfo.mpActor && (fopAcM_GetName(atInfo.mpActor) == PROC_FGMAHOU)) {
if (atInfo.mpActor && (fopAcM_GetName(atInfo.mpActor) == fpcNm_FGMAHOU_e)) {
i_this->m670++;
anm_init(i_this, FGANON_BCK_DAMAGE1, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
@@ -1457,9 +1455,9 @@ void damage_check(fganon_class* i_this) {
pPos = i_this->mCyl.GetTgHitPosP();
atInfo.pParticlePos = pPos;
atInfo.mpActor = at_power_check(&atInfo);
if((atInfo.mpObj != NULL) && (atInfo.mpObj->ChkAtType(AT_TYPE_SWORD)) && (dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_1_e ||
dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_3_e ||
dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_2_e)) {
if((atInfo.mpObj != NULL) && (atInfo.mpObj->ChkAtType(AT_TYPE_SWORD)) && (dComIfGs_getSelectEquip(0) == dItemNo_MASTER_SWORD_1_e ||
dComIfGs_getSelectEquip(0) == dItemNo_MASTER_SWORD_3_e ||
dComIfGs_getSelectEquip(0) == dItemNo_MASTER_SWORD_2_e)) {
atInfo.mpActor = cc_at_check(a_this, &atInfo);
if (atInfo.mbDead) {
dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, &a_this->eyePos, NULL);
@@ -2204,9 +2202,9 @@ void energy_ball_move(fganon_class* i_this) {
atInfo.mpObj = NULL;
}
if ((atInfo.mpObj && atInfo.mResultingAttackType == 1 && atInfo.mpObj->ChkAtType(AT_TYPE_SWORD) &&
(dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_1_e ||
dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_3_e ||
dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_2_e)) ||
(dComIfGs_getSelectEquip(0) == dItemNo_MASTER_SWORD_1_e ||
dComIfGs_getSelectEquip(0) == dItemNo_MASTER_SWORD_3_e ||
dComIfGs_getSelectEquip(0) == dItemNo_MASTER_SWORD_2_e)) ||
bVar3)
{
local_5c = a_this->eyePos - i_this->m3E0;
@@ -2340,7 +2338,7 @@ void energy_ball_move(fganon_class* i_this) {
if (i_this->mBallAtSph.ChkAtHit() != 0) {
atInfo.mpActor = i_this->mBallAtSph.GetAtHitObj()->GetAc();
if ((atInfo.mpActor && (fopAcM_GetName(atInfo.mpActor) == PROC_PLAYER)) && (i_this->mAction != 22)) {
if ((atInfo.mpActor && (fopAcM_GetName(atInfo.mpActor) == fpcNm_PLAYER_e)) && (i_this->mAction != 22)) {
i_this->m68B = 1;
i_this->mAction = 5;
i_this->mMode = 1;
@@ -2361,7 +2359,7 @@ void energy_ball_move(fganon_class* i_this) {
void* mahou_se_set(void* i_act, void* i_other) {
fganon_class* i_this = (fganon_class*)i_act;
fopAc_ac_c* a_this = &i_this->actor;
if ((fopAc_IsActor(i_this)) && fopAcM_GetName(a_this) == PROC_FGMAHOU) {
if ((fopAc_IsActor(i_this)) && fopAcM_GetName(a_this) == fpcNm_FGMAHOU_e) {
if (a_this->health == 0) {
fopAcM_seStartCurrent(a_this, JA_SE_OBJ_PG_EBALL_FLY_L, 0);
}
@@ -2744,7 +2742,7 @@ static cPhs_State daFganon_Create(fopAc_ac_c* a_this) {
if ((i_this->mSwitchNo != 0xFF) && (dComIfGs_isSwitch(i_this->mSwitchNo, dComIfGp_roomControl_getStayNo()) != 0)) {
if (((fopAcM_GetParam(a_this) & 0xF) == 2) && !(dComIfGs_isEventBit(dSv_event_flag_c::UNK_3A08))) { // Probably a flag to do with beating FF1 so PG spawns?
fopAcM_create(PROC_BOKO, daBoko_c::Type_PGANON_SWORD_e, &a_this->current.pos, fopAcM_GetRoomNo(a_this));
fopAcM_create(fpcNm_BOKO_e, daBoko_c::Type_PGANON_SWORD_e, &a_this->current.pos, fopAcM_GetRoomNo(a_this));
}
return cPhs_ERROR_e;
}
@@ -2947,7 +2945,7 @@ static cPhs_State daFganon_Create(fopAc_ac_c* a_this) {
deru_brk(i_this);
}
e_this->initBt(REG8_F(8) + 300.0f, 300.0f);
i_this->mCapeID = fopAcM_create(PROC_MANT, 1, &a_this->current.pos, fopAcM_GetRoomNo(a_this));
i_this->mCapeID = fopAcM_create(fpcNm_MANT_e, 1, &a_this->current.pos, fopAcM_GetRoomNo(a_this));
daFganon_Execute(i_this);
}
return res2;
@@ -2963,18 +2961,18 @@ static actor_method_class l_daFganon_Method = {
};
actor_process_profile_definition g_profile_FGANON = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_FGANON,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_FGANON_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(fganon_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_FGANON,
/* Draw Prio */ fpcDwPi_FGANON_e,
/* Actor SubMtd */ &l_daFganon_Method,
/* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_fgmahou.cpp
+8 -10
View File
@@ -5,8 +5,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_fgmahou.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
#include "d/d_s_play.h"
#include "d/d_particle_name.h"
@@ -25,7 +23,7 @@ static BOOL daFgmahou_Draw(fgmahou_class* i_this) {
/* 000000E4-00000130 .text boss_s_sub__FPvPv */
static void* boss_s_sub(void* param_1, void*) {
if(fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_FGANON) {
if(fopAc_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_FGANON_e) {
return param_1;
}
@@ -435,18 +433,18 @@ static actor_method_class l_daFgmahou_Method = {
};
actor_process_profile_definition g_profile_FGMAHOU = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_FGMAHOU,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_FGMAHOU_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(fgmahou_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_FGMAHOU,
/* Draw Prio */ fpcDwPi_FGMAHOU_e,
/* Actor SubMtd */ &l_daFgmahou_Method,
/* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_fire.cpp
+8 -10
View File
@@ -7,8 +7,6 @@
#include "d/actor/d_a_fire.h"
#include "d/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
static dCcD_SrcCyl l_cyl_src = {
// dCcD_SrcGObjInf
@@ -250,7 +248,7 @@ bool daFire_c::_execute() {
/* 00000A70-00000AD8 .text search_wind__8daFire_cFv */
void daFire_c::search_wind() {
fopAc_ac_c* pActor = fopAcM_SearchByName(PROC_WindTag);
fopAc_ac_c* pActor = fopAcM_SearchByName(fpcNm_WindTag_e);
if (pActor) {
field_0x8F0 = fopAcM_GetID(pActor);
} else {
@@ -539,18 +537,18 @@ static actor_method_class daFireMethodTable = {
};
actor_process_profile_definition g_profile_Fire = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_Fire,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Fire_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daFire_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_Fire,
/* Draw Prio */ fpcDwPi_Fire_e,
/* Actor SubMtd */ &daFireMethodTable,
/* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_floor.cpp
+9 -11
View File
@@ -8,8 +8,6 @@
#include "d/res/res_hhyu1.h"
#include "d/d_com_inf_game.h"
#include "d/actor/d_a_player.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "m_Do/m_Do_mtx.h"
namespace daFloor_prm {
@@ -20,9 +18,9 @@ const char daFloor_c::m_arcname[6] = "Hhyu1";
/* 00000078-000000DC .text rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */
void rideCallBack(dBgW*, fopAc_ac_c* i_this, fopAc_ac_c* i_other) {
if (fopAcM_GetName(i_other) == PROC_PLAYER && !((daPy_py_c*)i_other)->checkEquipHeavyBoots()) {
if (fopAcM_GetName(i_other) == fpcNm_PLAYER_e && !((daPy_py_c*)i_other)->checkEquipHeavyBoots()) {
((daFloor_c*)i_this)->field_0x2d9 = 1;
} else if (fopAcM_GetName(i_other) == PROC_PLAYER && ((daFloor_c*)i_this)->field_0x2d9 && ((daPy_py_c*)i_other)->checkEquipHeavyBoots() && !((daFloor_c*)i_this)->field_0x2d8) {
} else if (fopAcM_GetName(i_other) == fpcNm_PLAYER_e && ((daFloor_c*)i_this)->field_0x2d9 && ((daPy_py_c*)i_other)->checkEquipHeavyBoots() && !((daFloor_c*)i_this)->field_0x2d8) {
((daFloor_c*)i_this)->field_0x2d8 = 1;
((daFloor_c*)i_this)->field_0x2da = 6;
}
@@ -152,18 +150,18 @@ static actor_method_class daFloorMethodTable = {
};
actor_process_profile_definition g_profile_FLOOR = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0003,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_FLOOR,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0003,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_FLOOR_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daFloor_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_FLOOR,
/* Draw Prio */ fpcDwPi_FLOOR_e,
/* Actor SubMtd */ &daFloorMethodTable,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_fm.cpp
+42 -44
View File
@@ -6,8 +6,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_fm.h"
#include "d/actor/d_a_player_main.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
#include "d/d_lib.h"
#include "d/d_jnt_hit.h"
@@ -571,12 +569,12 @@ fopAc_ac_c* daFm_c::searchNearOtherActor(fopAc_ac_c* i_actor) {
f32 dist = fopAcM_searchActorDistanceXZ(this, i_actor);
if(dist < l_HIO.field_0x0E4) {
if(fopAcM_GetName(i_actor) == PROC_BOMB) {
if(fopAcM_GetName(i_actor) == fpcNm_BOMB_e) {
mpActorTarget = i_actor;
if(!((daBomb_c*)mpActorTarget)->chk_state(daBomb_c::STATE_0)) {
return i_actor;
}
} else if(fopAcM_GetName(i_actor) == PROC_TSUBO) {
} else if(fopAcM_GetName(i_actor) == fpcNm_TSUBO_e) {
daPy_lk_c* pLink = daPy_getPlayerLinkActorClass();
f32 dist2 = fopAcM_searchActorDistanceXZ(this, dComIfGp_getPlayer(0));
@@ -611,7 +609,7 @@ static void* searchNearFm_CB(void* param_1, void* param_2) {
/* 00000F44-00001150 .text searchNearFm__6daFm_cFP10fopAc_ac_c */
void* daFm_c::searchNearFm(fopAc_ac_c* i_actor) {
f32 dist;
if(fopAc_IsActor(i_actor) && fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_FM) { // redundant isactor check?
if(fopAc_IsActor(i_actor) && fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_FM_e) { // redundant isactor check?
f32 abs = (field_0x3E4 - current.pos).absXZ();
dist = fopAcM_searchActorDistanceXZ(this, i_actor);
if(dist != 0.0f) {
@@ -969,7 +967,7 @@ void daFm_c::setGrabPos() {
if (bomb == NULL) {
mGrabPos = current.pos;
} else {
if (fopAcM_GetName(bomb) == PROC_BOMB && bomb->chk_state(daBomb_c::STATE_0)) {
if (fopAcM_GetName(bomb) == fpcNm_BOMB_e && bomb->chk_state(daBomb_c::STATE_0)) {
mGrabPos = current.pos;
return;
}
@@ -996,24 +994,24 @@ cXyz daFm_c::getOffsetPos() {
} else {
s16 procName = fopAcM_GetName(mpActorTarget);
if(procName == PROC_NPC_CB1) {
if(procName == fpcNm_NPC_CB1_e) {
if(fopAcM_checkCarryNow(mpActorTarget)) {
offset.set(0.0f, 20.0f, 0.0f);
} else {
offset.set(0.0f, 80.0f, 0.0f);
}
} else if(procName == PROC_NPC_MD) {
} else if(procName == fpcNm_NPC_MD_e) {
if(fopAcM_checkCarryNow(mpActorTarget)) {
offset.set(0.0f, 20.0f, 0.0f);
} else {
offset.set(0.0f, 140.0f, 0.0f);
}
} else if(procName == PROC_BOMB) {
} else if(procName == fpcNm_BOMB_e) {
offset.set(0.0f, 80.0f, 0.0f);
} else if(procName == PROC_TSUBO) {
} else if(procName == fpcNm_TSUBO_e) {
switch(((daTsubo::Act_c*)mpActorTarget)->prm_get_type()) {
case 5:
@@ -1043,7 +1041,7 @@ u8 daFm_c::checkPlayerGrabBomb() {
if(ac == NULL) {
return false;
}
return fopAcM_GetName(ac) == PROC_BOMB;
return fopAcM_GetName(ac) == fpcNm_BOMB_e;
}
/* 000028D4-00002954 .text checkPlayerGrabNpc__6daFm_cFv */
@@ -1592,11 +1590,11 @@ void daFm_c::modeAttack() {
fopAcM_setCarryNow(mpActorTarget, 0);
field_0x684 = 4;
if (fopAcM_GetName(mpActorTarget) == PROC_NPC_CB1) {
if (fopAcM_GetName(mpActorTarget) == fpcNm_NPC_CB1_e) {
((daNpc_Cb1_c*)mpActorTarget)->noCarryAction();
}
if (fopAcM_GetName(mpActorTarget) == PROC_NPC_MD) {
if (fopAcM_GetName(mpActorTarget) == fpcNm_NPC_MD_e) {
((daNpc_Md_c*)mpActorTarget)->noCarryAction();
}
@@ -1626,7 +1624,7 @@ void daFm_c::modeAttack() {
fopAc_ac_c* actor = mpActorTarget;
s16 procName = fopAcM_GetName(actor);
if (procName == PROC_BOMB) {
if (procName == fpcNm_BOMB_e) {
if (!fopAcM_CheckStatus(actor, fopAcStts_CARRY_e)) {
fopAcM_setCarryNow(actor, 0);
field_0x684 = 2;
@@ -1636,7 +1634,7 @@ void daFm_c::modeAttack() {
} else {
modeProcInit(7);
}
} else if (procName == PROC_TSUBO) {
} else if (procName == fpcNm_TSUBO_e) {
if (!fopAcM_CheckStatus(actor, fopAcStts_CARRY_e)) {
fopAcM_setCarryNow(actor, 0);
field_0x684 = 3;
@@ -1714,7 +1712,7 @@ void daFm_c::modeThrow() {
field_0x684 = 0;
mGrabPos = current.pos;
} else {
if(fopAcM_GetName(mpActorTarget) == PROC_BOMB || fopAcM_GetName(mpActorTarget) == PROC_TSUBO) {
if(fopAcM_GetName(mpActorTarget) == fpcNm_BOMB_e || fopAcM_GetName(mpActorTarget) == fpcNm_TSUBO_e) {
mpActorTarget->current.angle.y = shape_angle.y;
mpActorTarget->shape_angle.y = shape_angle.y;
mpActorTarget->speedF = l_HIO.field_0x0F0;
@@ -1729,7 +1727,7 @@ void daFm_c::modeThrow() {
f32 dropspeed = temp *= l_HIO.field_0x0F4;
daTsubo::Act_c* tsubo = (daTsubo::Act_c*)mpActorTarget;
if(fopAcM_GetName(mpActorTarget) == PROC_TSUBO) {
if(fopAcM_GetName(mpActorTarget) == fpcNm_TSUBO_e) {
switch(tsubo->prm_get_type()) {
case 0:
case 1:
@@ -1897,7 +1895,7 @@ void daFm_c::modeGrabInit() {
setAnm(0xC, false);
} else {
s16 procName = fopAcM_GetName(mpActorTarget);
if(procName == PROC_BOMB || procName == PROC_TSUBO) {
if(procName == fpcNm_BOMB_e || procName == fpcNm_TSUBO_e) {
setAnm(9, false);
}
}
@@ -2007,7 +2005,7 @@ void daFm_c::modeGrab() {
}
} else {
s16 procName = fopAcM_GetName(mpActorTarget);
if (procName == PROC_BOMB || procName == PROC_TSUBO) {
if (procName == fpcNm_BOMB_e || procName == fpcNm_TSUBO_e) {
moveRndBack();
mGrabPos = field_0x61C;
if (!daPy_getPlayerLinkActorClass()->checkPlayerGuard()) {
@@ -2068,13 +2066,13 @@ void daFm_c::modeGrabDemo() {
} else {
if (mAnmPrmIdx == 6 && mpMorf->getFrame() == 40.0f) {
s16 procName = fopAcM_GetName(mpActorTarget);
if (procName == PROC_NPC_MD) {
if (procName == fpcNm_NPC_MD_e) {
fopAcM_monsSeStart(this, JA_SE_CV_MD_DAMAGE, 0);
} else if (procName == PROC_NPC_CB1) {
} else if (procName == fpcNm_NPC_CB1_e) {
fopAcM_monsSeStart(this, JA_SE_CV_CB_DAMAGE, 0);
}
}
if (fopAcM_GetName((daNpc_Md_c *)mpActorTarget) == PROC_NPC_MD) { // ghidra shows cast here but unnecessary
if (fopAcM_GetName((daNpc_Md_c *)mpActorTarget) == fpcNm_NPC_MD_e) { // ghidra shows cast here but unnecessary
((daNpc_Md_c *)mpActorTarget)->changeCaught02();
field_0x688 = true;
}
@@ -2082,11 +2080,11 @@ void daFm_c::modeGrabDemo() {
if (dComIfGp_evmng_endCheck("DEFAULT_FM_SUIKOMI_NPC")) {
if (field_0x2C8 != 0xff) {
cancelGrab();
if (fopAcM_GetName(mpActorTarget) == PROC_NPC_CB1) {
if (fopAcM_GetName(mpActorTarget) == fpcNm_NPC_CB1_e) {
dComIfGs_onEventBit(dSv_event_flag_c::UNK_3408);
((daPy_npc_c *)mpActorTarget)->setPointRestart(field_0x2C8, 1);
}
if (fopAcM_GetName(mpActorTarget) == PROC_NPC_MD) {
if (fopAcM_GetName(mpActorTarget) == fpcNm_NPC_MD_e) {
dComIfGs_onEventBit(dSv_event_flag_c::UNK_3404);
((daPy_npc_c *)mpActorTarget)->setPointRestart(field_0x2C8, 2);
}
@@ -2145,7 +2143,7 @@ void daFm_c::modePrepareItem() {
if(temp == 3) {
if(mpMorf->isStop()) {
u32 skullPrm = daTsubo::Act_c::prm_make_skull();
mProcId2 = fopAcM_create(PROC_TSUBO, skullPrm, &field_0x61C, tevStr.mRoomNo);
mProcId2 = fopAcM_create(fpcNm_TSUBO_e, skullPrm, &field_0x61C, tevStr.mRoomNo);
return;
}
}
@@ -2678,7 +2676,7 @@ void daFm_c::resetInvKine() {
/* 000070F4-000071E0 .text grabBomb__6daFm_cFv */
void daFm_c::grabBomb() {
if (fopAcM_GetName(mpActorTarget) == PROC_BOMB) {
if (fopAcM_GetName(mpActorTarget) == fpcNm_BOMB_e) {
cXyz temp_pos(5.0f, -10.0f, 5.0f);
cXyz pos = l_HIO.field_0x038 + temp_pos;
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(5));
@@ -2693,7 +2691,7 @@ void daFm_c::grabBomb() {
/* 000071E0-0000743C .text grabTsubo__6daFm_cFv */
void daFm_c::grabTsubo() {
if(fopAcM_GetName(mpActorTarget) == PROC_TSUBO) {
if(fopAcM_GetName(mpActorTarget) == fpcNm_TSUBO_e) {
daTsubo::Act_c* tsubo = (daTsubo::Act_c*)mpActorTarget;
cXyz pos(0.0f, 0.0f, 0.0f);
@@ -2771,14 +2769,14 @@ void daFm_c::grabNPC() {
if(isNpc(mpActorTarget) == true) {
cXyz temp(0.0f, 0.0f, 0.0f);
csXyz angle(0, 0, 0);
if(fopAcM_GetName(mpActorTarget) == PROC_NPC_CB1) {
if(fopAcM_GetName(mpActorTarget) == fpcNm_NPC_CB1_e) {
temp.set(-15.0f, -10.0f, 8.0f);
angle.x = 0;
angle.y = 16000;
angle.z = -4000;
}
if(fopAcM_GetName(mpActorTarget) == PROC_NPC_MD) {
if(fopAcM_GetName(mpActorTarget) == fpcNm_NPC_MD_e) {
temp.set(10.0f, 0.0f, 5.0f);
angle.x = 4000;
angle.y = 18000;
@@ -2799,9 +2797,9 @@ void daFm_c::searchTarget() {
if(!dComIfGp_event_runCheck() || field_0x2E4 != 0) {
fopAc_ac_c* actor = mpActorTarget = (fopAc_ac_c*)fopAcM_Search(searchNearOtherActor_CB, this);
if(mpActorTarget == NULL) {
actor = fopAcM_SearchByName(PROC_NPC_CB1);
actor = fopAcM_SearchByName(fpcNm_NPC_CB1_e);
if(actor == NULL) {
actor = fopAcM_SearchByName(PROC_NPC_MD);
actor = fopAcM_SearchByName(fpcNm_NPC_MD_e);
}
if(actor != NULL) {
@@ -2846,8 +2844,8 @@ void daFm_c::setBaseTarget() {
fopAc_ac_c* pMdActor;
switch(field_0x2DC) {
case 0:
fopAcM_SearchByName(PROC_NPC_CB1);
pMdActor = fopAcM_SearchByName(PROC_NPC_MD);
fopAcM_SearchByName(fpcNm_NPC_CB1_e);
pMdActor = fopAcM_SearchByName(fpcNm_NPC_MD_e);
pLink = daPy_getPlayerLinkActorClass();
if (field_0x2D0 == 1 || field_0x2D0 == 2) {
@@ -2874,12 +2872,12 @@ void daFm_c::setBaseTarget() {
mBaseTarget = daPy_getPlayerLinkActorClass();
break;
case 2:
fopAc_ac_c* actor = fopAcM_SearchByName(PROC_NPC_CB1);
fopAc_ac_c* actor = fopAcM_SearchByName(fpcNm_NPC_CB1_e);
if(actor != NULL) {
mBaseTarget = actor;
} else {
actor = fopAcM_SearchByName(PROC_NPC_MD);
actor = fopAcM_SearchByName(fpcNm_NPC_MD_e);
if(actor != NULL) {
mBaseTarget = actor;
}
@@ -2906,7 +2904,7 @@ bool daFm_c::isNpc(fopAc_ac_c* i_actor) {
if(i_actor == NULL) {
return false;
}
return fopAcM_GetName(i_actor) == PROC_NPC_CB1 || fopAcM_GetName(i_actor) == PROC_NPC_MD;
return fopAcM_GetName(i_actor) == fpcNm_NPC_CB1_e || fopAcM_GetName(i_actor) == fpcNm_NPC_MD_e;
}
/* 00007C7C-00007CD0 .text checkHeight__6daFm_cFP10fopAc_ac_c */
@@ -3026,7 +3024,7 @@ bool daFm_c::_execute() {
holeExecute();
fopAcM_SearchByID(mProcId, &mpActorTarget);
daBomb_c* bomb = (daBomb_c*)mpActorTarget;
if(bomb != NULL && fopAcM_GetName(bomb) == PROC_BOMB && bomb->chk_state(daBomb_c::STATE_0)) {
if(bomb != NULL && fopAcM_GetName(bomb) == fpcNm_BOMB_e && bomb->chk_state(daBomb_c::STATE_0)) {
mpActorTarget = NULL;
mProcId = 0;
modeProcInit(7);
@@ -3519,18 +3517,18 @@ static actor_method_class daFmMethodTable = {
};
actor_process_profile_definition g_profile_FM = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0003,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_FM,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0003,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_FM_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daFm_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_FM,
/* Draw Prio */ fpcDwPi_FM_e,
/* Actor SubMtd */ &daFmMethodTable,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK200000_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_ghostship.cpp
+7 -9
View File
@@ -8,8 +8,6 @@
#include "d/res/res_ayush.h"
#include "SSystem/SComponent/c_math.h"
#include "m_Do/m_Do_mtx.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_com_inf_game.h"
#include "d/d_s_play.h"
#include "d/d_kankyo_wether.h"
@@ -478,18 +476,18 @@ static actor_method_class daGhostshipMethodTable = {
};
actor_process_profile_definition g_profile_AYUSH = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_AYUSH,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_AYUSH_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daGhostship_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_AYUSH,
/* Draw Prio */ fpcDwPi_AYUSH_e,
/* Actor SubMtd */ &daGhostshipMethodTable,
/* Status */ 0x03 | fopAcStts_SHOWMAP_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_4_e,
/* Cull Type */ fopAc_CULLBOX_4_e,
};
src/d/actor/d_a_gm.cpp
+7 -9
View File
@@ -6,8 +6,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_gm.h"
#include "m_Do/m_Do_ext.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
/* 000000EC-0000032C .text nodeCallBack__FP7J3DNodei */
@@ -259,18 +257,18 @@ static actor_method_class l_daGM_Method = {
};
actor_process_profile_definition g_profile_GM = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_GM,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_GM_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(gm_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_GM,
/* Draw Prio */ fpcDwPi_GM_e,
/* Actor SubMtd */ &l_daGM_Method,
/* Status */ fopAcStts_SHOWMAP_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_gnd.cpp
+7 -9
View File
@@ -5,8 +5,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_gnd.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
/* 000000EC-0000023C .text __ct__11daGnd_HIO_cFv */
@@ -321,18 +319,18 @@ static actor_method_class l_daGnd_Method = {
};
actor_process_profile_definition g_profile_GND = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_GND,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_GND_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(gnd_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_GND,
/* Draw Prio */ fpcDwPi_GND_e,
/* Actor SubMtd */ &l_daGnd_Method,
/* Status */ fopAcStts_UNK40000_e | fopAcStts_BOSS_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_goal_flag.cpp
+11 -13
View File
@@ -15,8 +15,6 @@
#include "d/res/res_gflag.h"
#include "d/res/res_tgflag.h"
#include "d/d_path.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "assets/l_txa_dummy_hataTEX.h"
#include "m_Do/m_Do_controller_pad.h"
@@ -436,7 +434,7 @@ BOOL daGoal_Flag_c::CreateBuoyRaces() {
rope_points_p->m_position.z
);
fopAcM_createChild(
PROC_Obj_Buoyrace,
fpcNm_Obj_Buoyrace_e,
fopAcM_GetID(this),
j | (i << 8), &rope_point_pos,
fopAcM_GetRoomNo(this),
@@ -662,7 +660,7 @@ cPhs_State daGoal_Flag_c::_create() {
u16 time_limit_modifier = (u16)dComIfGs_getEventReg(dSv_event_flag_c::UNK_AAFF) * 10;
time_limit -= time_limit_modifier;
mTimerProcID = fopMsgM_Timer_create(
PROC_TIMER,
fpcNm_TIMER_e,
2,
time_limit,
3,
@@ -675,7 +673,7 @@ cPhs_State daGoal_Flag_c::_create() {
);
mMgameStartProcID = fopMsgM_MiniGameStarter_create(
PROC_MINIGAME_STARTER,
fpcNm_MINIGAME_STARTER_e,
0,
0x200,
NULL
@@ -935,7 +933,7 @@ BOOL daGoal_Flag_c::TimerExecute() {
rupees_collected = dComIfGp_getMiniGameRupee();
remaining_time = timer_p->getRestTimeMs() / 10;
mMgameTermProcID = fopMsgM_MiniGameTerminater_create(
PROC_MINIGAME_TERMINATER,
fpcNm_MINIGAME_TERMINATER_e,
0,
finish_type,
remaining_time,
@@ -1063,18 +1061,18 @@ static actor_method_class daGoal_FlagMethodTable = {
};
actor_process_profile_definition g_profile_Goal_Flag = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_Goal_Flag,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Goal_Flag_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daGoal_Flag_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_Goal_Flag,
/* Draw Prio */ fpcDwPi_Goal_Flag_e,
/* Actor SubMtd */ &daGoal_FlagMethodTable,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_grass.cpp
+7 -9
View File
@@ -10,8 +10,6 @@
#include "d/d_com_inf_game.h"
#include "d/d_flower.h"
#include "d/d_grass.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_tree.h"
#include "SSystem/SComponent/c_sxyz.h"
@@ -203,18 +201,18 @@ static actor_method_class daGrass_METHODS = {
};
actor_process_profile_definition g_profile_GRASS = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_GRASS,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_GRASS_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(grass_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_GRASS,
/* Draw Prio */ fpcDwPi_GRASS_e,
/* Actor SubMtd */ &daGrass_METHODS,
/* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_grid.cpp
+7 -9
View File
@@ -6,8 +6,6 @@
#include "d/dolzel.h" // IWYU pragma: keep
#include "d/actor/d_a_grid.h"
#include "JSystem/J3DGraphBase/J3DPacket.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
static daHo_HIO_c l_HIO;
@@ -95,18 +93,18 @@ static actor_method_class l_daGrid_Method = {
};
actor_process_profile_definition g_profile_GRID = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_GRID,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_GRID_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daGrid_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_GRID,
/* Draw Prio */ fpcDwPi_GRID_e,
/* Actor SubMtd */ &l_daGrid_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_gy.cpp
+7 -9
View File
@@ -5,8 +5,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_gy.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
static dCcD_SrcSph l_sph_head_src = {
@@ -344,18 +342,18 @@ static actor_method_class daGyMethodTable = {
};
actor_process_profile_definition g_profile_GY = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_GY,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_GY_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daGy_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_GY,
/* Draw Prio */ fpcDwPi_GY_e,
/* Actor SubMtd */ &daGyMethodTable,
/* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ENEMY_e,
/* CullType */ fopAc_CULLBOX_4_e,
/* Cull Type */ fopAc_CULLBOX_4_e,
};
src/d/actor/d_a_gy_ctrl.cpp
+19 -21
View File
@@ -9,8 +9,6 @@
#if VERSION > VERSION_DEMO
#include "d/actor/d_a_gy.h"
#endif
#include "d/d_procname.h"
#include "d/d_priority.h"
#if VERSION > VERSION_DEMO
#include "d/d_s_play.h"
#endif
@@ -72,11 +70,11 @@ void* searchNearActor_CB(void* arg0, void* arg1) {
void* daGy_Ctrl_c::searchNearActor(fopAc_ac_c* arg1) {
if (fopAc_IsActor(arg1)) {
f32 dVar3 = fopAcM_searchActorDistanceXZ(this, arg1);
if (m328 == 0 && fpcM_GetName(arg1) == PROC_GY_CTRLB && dVar3 < 6000.0f) {
if (m328 == 0 && fpcM_GetName(arg1) == fpcNm_GY_CTRLB_e && dVar3 < 6000.0f) {
return arg1;
}
if (fpcM_GetName(arg1) == PROC_DAIOCTA || fpcM_GetName(arg1) == PROC_OBJ_IKADA || fpcM_GetName(arg1) == PROC_NPC_SO) {
if (fpcM_GetName(arg1) == fpcNm_DAIOCTA_e || fpcM_GetName(arg1) == fpcNm_OBJ_IKADA_e || fpcM_GetName(arg1) == fpcNm_NPC_SO_e) {
if (dVar3 < 6000.0f) {
return arg1;
}
@@ -344,7 +342,7 @@ void daGy_Ctrl_c::modeCreate() {
sp10.y = m308[m31C];
sp18.y = -1000.0f;
m360[m31C] = fopAcM_createChild(PROC_GY, fopAcM_GetID(this), 0xffffffff, &sp18, tevStr.mRoomNo, &sp10);
m360[m31C] = fopAcM_createChild(fpcNm_GY_e, fopAcM_GetID(this), 0xffffffff, &sp18, tevStr.mRoomNo, &sp10);
m374[m31C] = true;
m350 = l_HIO.m08;
}
@@ -521,7 +519,7 @@ void daGy_Ctrl_c::getArg() {
/* 000013F8-00001458 .text checkGyCtrlExist__11daGy_Ctrl_cFv */
bool daGy_Ctrl_c::checkGyCtrlExist() {
s32 local_8 = PROC_GY_CTRL;
s32 local_8 = fpcNm_GY_CTRL_e;
daGy_Ctrl_c* pfVar1 = (daGy_Ctrl_c*)fopAcM_SearchByName(local_8);
if ((pfVar1 != NULL) && (pfVar1->m328 == 0) && (pfVar1->m331 == 1)) {
return true;
@@ -539,7 +537,7 @@ cPhs_State daGy_Ctrl_c::_create() {
return cPhs_ERROR_e;
}
if (!dComIfGs_checkGetItem(dItem_BOOMERANG_e)) {
if (!dComIfGs_checkGetItem(dItemNo_BOOMERANG_e)) {
return cPhs_ERROR_e;
}
@@ -586,35 +584,35 @@ static actor_method_class daGy_CtrlMethodTable = {
};
actor_process_profile_definition g_profile_GY_CTRL = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_GY_CTRL,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_GY_CTRL_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daGy_Ctrl_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_GY_CTRL,
/* Draw Prio */ fpcDwPi_GY_CTRL_e,
/* Actor SubMtd */ &daGy_CtrlMethodTable,
/* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_4_e,
/* Cull Type */ fopAc_CULLBOX_4_e,
};
actor_process_profile_definition g_profile_GY_CTRLB = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_GY_CTRLB,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_GY_CTRLB_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daGy_Ctrl_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_GY_CTRLB,
/* Draw Prio */ fpcDwPi_GY_CTRLB_e,
/* Actor SubMtd */ &daGy_CtrlMethodTable,
/* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_4_e,
/* Cull Type */ fopAc_CULLBOX_4_e,
};
src/d/actor/d_a_himo2.cpp
+13 -15
View File
@@ -12,8 +12,6 @@
#include "d/actor/d_a_dr2.h"
#include "d/actor/d_a_player.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_cc_d.h"
#include "d/d_s_play.h"
#include "d/res/res_link.h"
@@ -53,7 +51,7 @@ public:
/* 0x20 */ f32 m20;
};
himo2HIO_c l_himo2HIO;
static himo2HIO_c l_himo2HIO;
f32 rope_scale;
#if VERSION > VERSION_DEMO
static btd_class* btd;
@@ -514,7 +512,7 @@ static BOOL daHimo2_Draw(himo2_class* i_this) {
/* 800ECBE8-800ECC54 .text s_a_d_sub__FPvPv */
void* s_a_d_sub(void* param_1, void* param_2) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_KUI)) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_KUI_e)) {
himo2_class* rope = (himo2_class*)param_2;
rope->m218C[rope->m24AC] = (fopAc_ac_c*)param_1;
rope->m24AC++;
@@ -658,7 +656,7 @@ BOOL himo2_class::setTargetPos(cXyz* param_1, f32* param_2, f32* param_3) {
/* 800ED2E0-800ED32C .text dr_a_sub__FPvPv */
void* dr_a_sub(void* param_1, void* param_2) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_DR2)) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_DR2_e)) {
return param_1;
} else {
return param_2 = NULL;
@@ -667,7 +665,7 @@ void* dr_a_sub(void* param_1, void* param_2) {
/* 800ED32C-800ED378 .text b_a_sub__FPvPv */
void* b_a_sub(void* param_1, void* param_2) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == PROC_BTD)) {
if ((fopAc_IsActor(param_1)) && (fopAcM_GetName(param_1) == fpcNm_BTD_e)) {
return param_1;
} else {
return param_2 = NULL;
@@ -850,7 +848,7 @@ void new_himo2_move(himo2_class* i_this) {
} else {
i_this->m02DC = 9;
}
if ((i_this->m217C != NULL) && (fopAcM_GetName(i_this->m217C) == PROC_KUI)) {
if ((i_this->m217C != NULL) && (fopAcM_GetName(i_this->m217C) == fpcNm_KUI_e)) {
i_this->m217C->health = 0;
}
#endif
@@ -1110,7 +1108,7 @@ void new_himo2_move(himo2_class* i_this) {
}
if ((CPad_CHECK_TRIG_X(0) || CPad_CHECK_TRIG_Y(0)) || CPad_CHECK_TRIG_Z(0)) {
i_this->m02DC = 5;
if (fopAcM_GetName(r4_r27) == PROC_BK) {
if (fopAcM_GetName(r4_r27) == fpcNm_BK_e) {
bk_class* bk = (bk_class*)r4_r27;
bk->dr.mAction = 0;
bk->dr.mMode = 0;
@@ -1859,18 +1857,18 @@ static actor_method_class l_daHimo2_Method = {
};
actor_process_profile_definition g_profile_HIMO2 = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0008,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_HIMO2,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0008,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_HIMO2_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(himo2_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_HIMO2,
/* Draw Prio */ fpcDwPi_HIMO2_e,
/* Actor SubMtd */ &l_daHimo2_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_himo3.cpp
+7 -9
View File
@@ -13,8 +13,6 @@
#include "d/res/res_link.h"
#include "d/res/res_himo3.h"
#include "d/d_s_play.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_com_inf_game.h"
#include "d/d_kankyo_wether.h"
#include "f_op/f_op_actor_mng.h"
@@ -859,18 +857,18 @@ static actor_method_class l_daHimo3_Method = {
};
actor_process_profile_definition g_profile_HIMO3 = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0008,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_HIMO3,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0008,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_HIMO3_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(himo3_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_HIMO3,
/* Draw Prio */ fpcDwPi_HIMO3_e,
/* Actor SubMtd */ &l_daHimo3_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_hitobj.cpp
+7 -9
View File
@@ -9,8 +9,6 @@
#include "f_op/f_op_actor.h"
#include "f_op/f_op_kankyo_mng.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
/* 00000078-00000080 .text daHitobj_Draw__FP12hitobj_class */
static BOOL daHitobj_Draw(hitobj_class* i_this) {
@@ -98,18 +96,18 @@ static actor_method_class l_daHitobj_Method = {
};
actor_process_profile_definition g_profile_HITOBJ = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_HITOBJ,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_HITOBJ_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(hitobj_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_HITOBJ,
/* Draw Prio */ fpcDwPi_HITOBJ_e,
/* Actor SubMtd */ &l_daHitobj_Method,
/* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_hmlif.cpp
+7 -9
View File
@@ -8,8 +8,6 @@
#include "d/res/res_hmlif.h"
#include "d/res/res_hyuf1.h"
#include "d/res/res_hyuf2.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_path.h"
#include "d/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
@@ -545,18 +543,18 @@ static actor_method_class daHmlifMethodTable = {
};
actor_process_profile_definition g_profile_Hmlif = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0002,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_Hmlif,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0002,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Hmlif_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daHmlif_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_Hmlif,
/* Draw Prio */ fpcDwPi_Hmlif_e,
/* Actor SubMtd */ &daHmlifMethodTable,
/* Status */ 0x04 | fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_hookshot.cpp
+7 -9
View File
@@ -10,8 +10,6 @@
#include "SSystem/SComponent/c_counter.h"
#include "d/actor/d_a_player_main.h"
#include "d/actor/d_a_ship.h" // IWYU pragma: keep
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "assets/l_chainS3TCTEX__d_hookshot.h"
const u16 l_chainS3TCTEX__width = 32;
@@ -576,18 +574,18 @@ static actor_method_class l_daHookshot_Method = {
};
actor_process_profile_definition g_profile_HOOKSHOT = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0006,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_HOOKSHOT,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0006,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_HOOKSHOT_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daHookshot_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_HOOKSHOT,
/* Draw Prio */ fpcDwPi_HOOKSHOT_e,
/* Actor SubMtd */ &l_daHookshot_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_hot_floor.cpp
+7 -9
View File
@@ -10,8 +10,6 @@
#include "JSystem/JUtility/JUTAssert.h"
#include "d/d_bg_w.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "m_Do/m_Do_ext.h"
#include "m_Do/m_Do_mtx.h"
@@ -134,18 +132,18 @@ static actor_method_class daHot_FloorMethodTable = {
};
actor_process_profile_definition g_profile_Hot_Floor = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_Hot_Floor,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Hot_Floor_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daHot_Floor_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_Hot_Floor,
/* Draw Prio */ fpcDwPi_Hot_Floor_e,
/* Actor SubMtd */ &daHot_FloorMethodTable,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_hys.cpp
+7 -9
View File
@@ -8,8 +8,6 @@
#include "d/res/res_hys.h"
#include "d/d_com_inf_game.h"
#include "m_Do/m_Do_mtx.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
const char* daHys_c::m_arcname[2] = {"Hys", "Hys"};
@@ -241,18 +239,18 @@ static actor_method_class daHysMethodTable = {
};
actor_process_profile_definition g_profile_Hys = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0008,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_Hys,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0008,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Hys_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daHys_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_Hys,
/* Draw Prio */ fpcDwPi_Hys_e,
/* Actor SubMtd */ &daHysMethodTable,
/* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_ib.cpp
+9 -11
View File
@@ -5,8 +5,6 @@
#include "d/dolzel.h" // IWYU pragma: keep
#include "d/actor/d_a_ib.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "d/d_com_inf_game.h"
#include "d/d_s_play.h"
@@ -136,11 +134,11 @@ BOOL daIball_c::createItem() {
itemBitNo = daIball_prm::getItemBitNo(this);
if ((itemBitNo == 0x1F || itemBitNo == 0xFF || itemBitNo == -1) || fopAcM_isItemForIb(itemBitNo, items[i], current.roomNo)) {
itemBitNo = -1;
items[i] = dItem_YELLOW_RUPEE_e;
items[i] = dItemNo_YELLOW_RUPEE_e;
}
} else if (isNonSavedEmono(items[i])) {
if (daIball_prm::getItemBitNo(this) != 0) {
items[i] = dItem_YELLOW_RUPEE_e;
items[i] = dItemNo_YELLOW_RUPEE_e;
}
itemBitNo = -1;
}
@@ -520,18 +518,18 @@ static actor_method_class l_daIball_Method = {
};
actor_process_profile_definition g_profile_Iball = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_Iball,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_Iball_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daIball_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_Iball,
/* Draw Prio */ fpcDwPi_Iball_e,
/* Actor SubMtd */ &l_daIball_Method,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_icelift.cpp
+7 -9
View File
@@ -6,8 +6,6 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_icelift.h"
#include "d/d_bg_w.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
/* 00000078-000000E0 .text _delete__9daIlift_cFv */
bool daIlift_c::_delete() {
@@ -108,18 +106,18 @@ static actor_method_class daIliftMethodTable = {
};
actor_process_profile_definition g_profile_ICE_LIFT = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0003,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_ICE_LIFT,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0003,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_ICE_LIFT_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daIlift_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_ICE_LIFT,
/* Draw Prio */ fpcDwPi_ICE_LIFT_e,
/* Actor SubMtd */ &daIliftMethodTable,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_ikari.cpp
+8 -10
View File
@@ -7,12 +7,10 @@
#include "d/actor/d_a_ikari.h"
#include "d/res/res_ikari.h"
#include "d/d_kankyo_wether.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "d/d_s_play.h"
#include "m_Do/m_Do_mtx.h"
daObjIkariHIO_c l_HIO;
static daObjIkariHIO_c l_HIO;
const char daIkari_c::M_arcname[6] = "Ikari";
@@ -193,18 +191,18 @@ static actor_method_class daIkariMethodTable = {
};
actor_process_profile_definition g_profile_IKARI = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_IKARI,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_IKARI_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daIkari_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_IKARI,
/* Draw Prio */ fpcDwPi_IKARI_e,
/* Actor SubMtd */ &daIkariMethodTable,
/* Status */ fopAcStts_NOCULLEXEC_e | fopAcStts_CULL_e | fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_CUSTOM_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
src/d/actor/d_a_item.cpp
+134 -136
View File
@@ -10,8 +10,6 @@
#include "d/actor/d_a_player_main.h"
#include "d/actor/d_a_sea.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/d_priority.h"
#include "f_op/f_op_camera.h"
#include "m_Do/m_Do_mtx.h"
#include "m_Do/m_Do_controller_pad.h"
@@ -34,39 +32,39 @@ cXyz setArrowTrans(s16 yRot, cXyz offset) {
/* 800F4C4C-800F4CD8 .text getYOffset__8daItem_cFv */
float daItem_c::getYOffset() {
switch (m_itemNo) {
case dItem_KNIGHTS_CREST_e:
case dItemNo_KNIGHTS_CREST_e:
return 0.0f;
case dItem_SKULL_NECKLACE_e:
case dItemNo_SKULL_NECKLACE_e:
return 0.0f;
case dItem_BOKOBABA_SEED_e:
case dItemNo_BOKOBABA_SEED_e:
return 0.0f;
case dItem_GOLDEN_FEATHER_e:
case dItemNo_GOLDEN_FEATHER_e:
return 0.0f;
case dItem_RED_JELLY_e:
case dItem_GREEN_JELLY_e:
case dItem_BLUE_JELLY_e:
case dItemNo_RED_JELLY_e:
case dItemNo_GREEN_JELLY_e:
case dItemNo_BLUE_JELLY_e:
return 0.0f;
case dItem_SMALL_KEY_e:
case dItem_BOSS_KEY_e:
case dItemNo_SMALL_KEY_e:
case dItemNo_BOSS_KEY_e:
return 0.0f;
case dItem_SHIELD_e:
case dItemNo_SHIELD_e:
return 23.0f;
case dItem_SWORD_e:
case dItemNo_SWORD_e:
return 20.0f;
case dItem_DROPPED_SWORD_e:
case dItemNo_DROPPED_SWORD_e:
return 10.0f;
case dItem_HEART_PIECE_e:
case dItem_HEART_CONTAINER_e:
case dItemNo_HEART_PIECE_e:
case dItemNo_HEART_CONTAINER_e:
return 0.0f;
case dItem_GREEN_RUPEE_e:
case dItem_BLUE_RUPEE_e:
case dItem_YELLOW_RUPEE_e:
case dItem_RED_RUPEE_e:
case dItem_PURPLE_RUPEE_e:
case dItem_ORANGE_RUPEE_e:
case dItem_SILVER_RUPEE_e:
case dItemNo_GREEN_RUPEE_e:
case dItemNo_BLUE_RUPEE_e:
case dItemNo_YELLOW_RUPEE_e:
case dItemNo_RED_RUPEE_e:
case dItemNo_PURPLE_RUPEE_e:
case dItemNo_ORANGE_RUPEE_e:
case dItemNo_SILVER_RUPEE_e:
return 0.0f;
case dItem_HEART_e:
case dItemNo_HEART_e:
return 0.0f;
default:
return 0.0f;
@@ -78,7 +76,7 @@ void daItem_c::set_mtx() {
cXyz pos = current.pos;
csXyz rot = current.angle;
#if VERSION > VERSION_DEMO
if (m_itemNo == dItem_HEART_CONTAINER_e) {
if (m_itemNo == dItemNo_HEART_CONTAINER_e) {
rot.y = shape_angle.y;
}
#endif
@@ -168,16 +166,16 @@ void daItem_c::CreateInit() {
show();
if (dItem_data::checkSpecialEffect(m_itemNo) && (m_itemNo != dItem_SMALL_KEY_e || (m_itemNo == dItem_SMALL_KEY_e && checkFlag(FLAG_UNK02)))) {
if (dItem_data::checkSpecialEffect(m_itemNo) && (m_itemNo != dItemNo_SMALL_KEY_e || (m_itemNo == dItemNo_SMALL_KEY_e && checkFlag(FLAG_UNK02)))) {
u16 particleID = dItem_data::getSpecialEffect(m_itemNo);
dComIfGp_particle_set(particleID, &current.pos, NULL, NULL, 0xFF, &mPtclFollowCb);
}
switch (m_itemNo) {
case dItem_BOMB_5_e:
case dItem_BOMB_10_e:
case dItem_BOMB_20_e:
case dItem_BOMB_30_e:
case dItemNo_BOMB_5_e:
case dItemNo_BOMB_10_e:
case dItemNo_BOMB_20_e:
case dItemNo_BOMB_30_e:
mScaleTarget.setall(0.6f);
break;
default:
@@ -197,11 +195,11 @@ void daItem_c::CreateInit() {
initAction();
switch (m_itemNo) {
case dItem_SWORD_e:
case dItem_SHIELD_e:
case dItemNo_SWORD_e:
case dItemNo_SHIELD_e:
fopAcM_OnStatus(this, fopAcStts_UNK4000_e);
break;
case dItem_DROPPED_SWORD_e:
case dItemNo_DROPPED_SWORD_e:
current.angle.x = 0x4000;
break;
}
@@ -209,7 +207,7 @@ void daItem_c::CreateInit() {
set_mtx();
animPlay(1.0f, 1.0f, 1.0f, 1.0f, 1.0f);
if (fopAcM_SearchByName(PROC_BST)) { // Gohdan
if (fopAcM_SearchByName(fpcNm_BST_e)) { // Gohdan
mpParticleEmitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_BSTKIRAKIRAARROW00, &current.pos);
}
}
@@ -227,7 +225,7 @@ cPhs_State daItem_c::_daItem_create() {
mItemBitNo = daItem_prm::getItemBitNo(this);
#if VERSION > VERSION_DEMO
if (m_itemNo != dItem_BLUE_JELLY_e) // Blue Chu Jelly uses mItemBitNo as if it was a switch.
if (m_itemNo != dItemNo_BLUE_JELLY_e) // Blue Chu Jelly uses mItemBitNo as if it was a switch.
#endif
{
mItemBitNo &= 0x7F;
@@ -324,7 +322,7 @@ void daItem_c::mode_proc_call() {
}
if (checkFlag(FLAG_BOOMERANG)) {
fopAc_ac_c* boomerang = (fopAc_ac_c*)fopAcM_SearchByName(PROC_BOOMERANG);
fopAc_ac_c* boomerang = (fopAc_ac_c*)fopAcM_SearchByName(fpcNm_BOOMERANG_e);
if (boomerang) {
current.pos = boomerang->current.pos;
} else {
@@ -333,7 +331,7 @@ void daItem_c::mode_proc_call() {
}
if (checkFlag(FLAG_HOOK)) {
fopAc_ac_c* grappling_hook = (fopAc_ac_c*)fopAcM_SearchByName(PROC_HIMO2);
fopAc_ac_c* grappling_hook = (fopAc_ac_c*)fopAcM_SearchByName(fpcNm_HIMO2_e);
if (grappling_hook) {
current.pos = grappling_hook->current.pos;
} else {
@@ -588,72 +586,72 @@ void daItem_c::itemGetExecute() {
mItemStatus = STATUS_INIT_NORMAL;
switch (m_itemNo) {
case dItem_HEART_e:
case dItemNo_HEART_e:
mDoAud_seStart(JA_SE_HEART_PIECE);
execItemGet(m_itemNo);
break;
case dItem_GREEN_RUPEE_e:
case dItemNo_GREEN_RUPEE_e:
mDoAud_seStart(JA_SE_LUPY_GET);
execItemGet(m_itemNo);
break;
case dItem_BLUE_RUPEE_e:
case dItemNo_BLUE_RUPEE_e:
mDoAud_seStart(JA_SE_BLUE_LUPY_GET);
execItemGet(m_itemNo);
break;
case dItem_YELLOW_RUPEE_e:
case dItemNo_YELLOW_RUPEE_e:
mDoAud_seStart(JA_SE_BLUE_LUPY_GET);
execItemGet(m_itemNo);
break;
case dItem_RED_RUPEE_e:
case dItemNo_RED_RUPEE_e:
mDoAud_seStart(JA_SE_RED_LUPY_GET);
execItemGet(m_itemNo);
break;
case dItem_PURPLE_RUPEE_e:
case dItemNo_PURPLE_RUPEE_e:
mDoAud_seStart(JA_SE_RED_LUPY_GET);
execItemGet(m_itemNo);
break;
case dItem_ORANGE_RUPEE_e:
case dItemNo_ORANGE_RUPEE_e:
mDoAud_seStart(JA_SE_RED_LUPY_GET);
execItemGet(m_itemNo);
break;
case dItem_SILVER_RUPEE_e:
case dItemNo_SILVER_RUPEE_e:
mDoAud_seStart(JA_SE_RED_LUPY_GET);
execItemGet(m_itemNo);
break;
case dItem_HEART_PIECE_e:
case dItemNo_HEART_PIECE_e:
mDoAud_seStart(JA_SE_HEART_PIECE);
mItemStatus = STATUS_INIT_GET_DEMO;
break;
case dItem_HEART_CONTAINER_e:
case dItemNo_HEART_CONTAINER_e:
mDoAud_seStart(JA_SE_HEART_PIECE);
mItemStatus = STATUS_INIT_GET_DEMO;
break;
case dItem_SMALL_MAGIC_e:
case dItemNo_SMALL_MAGIC_e:
mDoAud_seStart(JA_SE_MAGIC_POT_GET_S);
execItemGet(m_itemNo);
break;
case dItem_LARGE_MAGIC_e:
case dItemNo_LARGE_MAGIC_e:
mDoAud_seStart(JA_SE_MAGIC_POT_GET_L);
execItemGet(m_itemNo);
break;
case dItem_BOMB_5_e:
case dItem_BOMB_10_e:
case dItem_BOMB_20_e:
case dItem_BOMB_30_e:
case dItem_ARROW_10_e:
case dItem_ARROW_20_e:
case dItem_ARROW_30_e:
case dItemNo_BOMB_5_e:
case dItemNo_BOMB_10_e:
case dItemNo_BOMB_20_e:
case dItemNo_BOMB_30_e:
case dItemNo_ARROW_10_e:
case dItemNo_ARROW_20_e:
case dItemNo_ARROW_30_e:
mDoAud_seStart(JA_SE_CONSUMP_ITEM_GET);
execItemGet(m_itemNo);
break;
case dItem_SMALL_KEY_e:
case dItemNo_SMALL_KEY_e:
mItemStatus = STATUS_INIT_GET_DEMO;
break;
case dItem_TRIPLE_HEART_e:
case dItemNo_TRIPLE_HEART_e:
mDoAud_seStart(JA_SE_HEART_PIECE);
execItemGet(m_itemNo);
break;
case dItem_JOY_PENDANT_e:
case dItemNo_JOY_PENDANT_e:
mDoAud_seStart(JA_SE_SPOILS_GET);
if (!dComIfGs_isGetItemBeast(dBeastIdx_JOY_PENDANT_e)) {
mItemStatus = STATUS_INIT_GET_DEMO;
@@ -662,29 +660,29 @@ void daItem_c::itemGetExecute() {
execItemGet(m_itemNo);
}
break;
case dItem_DEKU_LEAF_e:
case dItemNo_DEKU_LEAF_e:
mItemStatus = STATUS_INIT_GET_DEMO;
break;
case dItem_SWORD_e: {
daItem_c* item = (daItem_c*)fopAcM_SearchByName(PROC_ITEM);
if (item && item->m_itemNo == dItem_SHIELD_e) {
case dItemNo_SWORD_e: {
daItem_c* item = (daItem_c*)fopAcM_SearchByName(fpcNm_ITEM_e);
if (item && item->m_itemNo == dItemNo_SHIELD_e) {
item->itemGetExecute();
}
mItemStatus = STATUS_INIT_GET_DEMO;
break;
}
case dItem_SHIELD_e: {
daItem_c* item = (daItem_c*)fopAcM_SearchByName(PROC_ITEM);
if (item && item->m_itemNo == dItem_SWORD_e) {
case dItemNo_SHIELD_e: {
daItem_c* item = (daItem_c*)fopAcM_SearchByName(fpcNm_ITEM_e);
if (item && item->m_itemNo == dItemNo_SWORD_e) {
item->itemGetExecute();
}
mItemStatus = STATUS_INIT_GET_DEMO;
break;
}
case dItem_DROPPED_SWORD_e:
case dItemNo_DROPPED_SWORD_e:
mItemStatus = STATUS_INIT_GET_DEMO;
break;
case dItem_SKULL_NECKLACE_e:
case dItemNo_SKULL_NECKLACE_e:
mDoAud_seStart(JA_SE_SPOILS_GET);
if (!dComIfGs_isGetItemBeast(dBeastIdx_SKULL_NECKLACE_e)) {
mItemStatus = STATUS_INIT_GET_DEMO;
@@ -693,7 +691,7 @@ void daItem_c::itemGetExecute() {
execItemGet(m_itemNo);
}
break;
case dItem_BOKOBABA_SEED_e:
case dItemNo_BOKOBABA_SEED_e:
mDoAud_seStart(JA_SE_SPOILS_GET);
if (!dComIfGs_isGetItemBeast(dBeastIdx_BOKOBABA_SEED_e)) {
mItemStatus = STATUS_INIT_GET_DEMO;
@@ -702,7 +700,7 @@ void daItem_c::itemGetExecute() {
execItemGet(m_itemNo);
}
break;
case dItem_GOLDEN_FEATHER_e:
case dItemNo_GOLDEN_FEATHER_e:
mDoAud_seStart(JA_SE_SPOILS_GET);
if (!dComIfGs_isGetItemBeast(dBeastIdx_GOLDEN_FEATHER_e)) {
mItemStatus = STATUS_INIT_GET_DEMO;
@@ -711,7 +709,7 @@ void daItem_c::itemGetExecute() {
execItemGet(m_itemNo);
}
break;
case dItem_KNIGHTS_CREST_e:
case dItemNo_KNIGHTS_CREST_e:
mDoAud_seStart(JA_SE_SPOILS_GET);
if (!dComIfGs_isGetItemBeast(dBeastIdx_KNIGHTS_CREST_e)) {
mItemStatus = STATUS_INIT_GET_DEMO;
@@ -720,7 +718,7 @@ void daItem_c::itemGetExecute() {
execItemGet(m_itemNo);
}
break;
case dItem_RED_JELLY_e:
case dItemNo_RED_JELLY_e:
mDoAud_seStart(JA_SE_SPOILS_GET);
if (!dComIfGs_isGetItemBeast(dBeastIdx_RED_JELLY_e)) {
mItemStatus = STATUS_INIT_GET_DEMO;
@@ -729,7 +727,7 @@ void daItem_c::itemGetExecute() {
execItemGet(m_itemNo);
}
break;
case dItem_GREEN_JELLY_e:
case dItemNo_GREEN_JELLY_e:
mDoAud_seStart(JA_SE_SPOILS_GET);
if (!dComIfGs_isGetItemBeast(dBeastIdx_GREEN_JELLY_e)) {
mItemStatus = STATUS_INIT_GET_DEMO;
@@ -738,7 +736,7 @@ void daItem_c::itemGetExecute() {
execItemGet(m_itemNo);
}
break;
case dItem_BLUE_JELLY_e:
case dItemNo_BLUE_JELLY_e:
mDoAud_seStart(JA_SE_SPOILS_GET);
if (!dComIfGs_isGetItemBeast(dBeastIdx_BLUE_JELLY_e)) {
mItemStatus = STATUS_INIT_GET_DEMO;
@@ -747,7 +745,7 @@ void daItem_c::itemGetExecute() {
execItemGet(m_itemNo);
}
break;
case dItem_BIRD_BAIT_5_e:
case dItemNo_BIRD_BAIT_5_e:
mDoAud_seStart(JA_SE_ESA_GET);
if (!dComIfGs_isGetItemBait(0)) {
mItemStatus = STATUS_INIT_GET_DEMO;
@@ -756,7 +754,7 @@ void daItem_c::itemGetExecute() {
execItemGet(m_itemNo);
}
break;
case dItem_HYOI_PEAR_e:
case dItemNo_HYOI_PEAR_e:
mDoAud_seStart(JA_SE_ESA_GET);
if (!dComIfGs_isGetItemBait(1)) {
mItemStatus = STATUS_INIT_GET_DEMO;
@@ -991,11 +989,11 @@ BOOL daItem_c::itemActionForSword() {
f32 temp = field_0x650 * 0.9f;
fopAcM_SetSpeed(this, 0.0f, -temp, 0.0f);
if (m_itemNo == dItem_SWORD_e) {
if (m_itemNo == dItemNo_SWORD_e) {
if (m_get_timer > 15) {
fopAcM_seStart(this, JA_SE_OBJ_LNK_SWORD_FALL, 0);
}
} else if (m_itemNo == dItem_SHIELD_e) {
} else if (m_itemNo == dItemNo_SHIELD_e) {
if (m_get_timer > 15) {
fopAcM_seStart(this, JA_SE_OBJ_LNK_SHIELD_FALL, 0);
}
@@ -1048,7 +1046,7 @@ BOOL daItem_c::itemActionForSword() {
BOOL daItem_c::itemActionForArrow() {
mAcch.CrrPos(*dComIfG_Bgsp());
if (mOnGroundTimer == 0 && mpParticleEmitter && fopAcM_SearchByName(PROC_BST)) { // Gohdan
if (mOnGroundTimer == 0 && mpParticleEmitter && fopAcM_SearchByName(fpcNm_BST_e)) { // Gohdan
mpParticleEmitter->setGlobalTranslation(current.pos);
}
@@ -1063,7 +1061,7 @@ BOOL daItem_c::itemActionForArrow() {
mOnGroundTimer++;
if (mOnGroundTimer == 1 && fopAcM_SearchByName(PROC_BST)) { // Gohdan
if (mOnGroundTimer == 1 && fopAcM_SearchByName(fpcNm_BST_e)) { // Gohdan
JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_AK_ST_BSTDROPARROWSMOKE00, &current.pos, NULL, NULL, 0xFF, &mPtclSmokeCb, fopAcM_GetRoomNo(this));
if (emitter) {
emitter->setMaxFrame(1);
@@ -1080,7 +1078,7 @@ BOOL daItem_c::itemActionForArrow() {
speedF = 0.0f;
#if VERSION > VERSION_DEMO
if (m_itemNo != dItem_HEART_CONTAINER_e)
if (m_itemNo != dItemNo_HEART_CONTAINER_e)
#endif
{
itemDefaultRotateY();
@@ -1088,7 +1086,7 @@ BOOL daItem_c::itemActionForArrow() {
}
#if VERSION > VERSION_DEMO
if (m_itemNo == dItem_HEART_CONTAINER_e) {
if (m_itemNo == dItemNo_HEART_CONTAINER_e) {
if (mOnGroundTimer != 0) {
getData();
s16 rotationSpeed = 0xFFFF / getData()->mRotateYSpeed;
@@ -1141,33 +1139,33 @@ void daItem_c::set_bound_se() {
}
switch (m_itemNo) {
case dItem_GREEN_RUPEE_e:
case dItem_BLUE_RUPEE_e:
case dItem_YELLOW_RUPEE_e:
case dItem_RED_RUPEE_e:
case dItem_PURPLE_RUPEE_e:
case dItem_ORANGE_RUPEE_e:
case dItemNo_GREEN_RUPEE_e:
case dItemNo_BLUE_RUPEE_e:
case dItemNo_YELLOW_RUPEE_e:
case dItemNo_RED_RUPEE_e:
case dItemNo_PURPLE_RUPEE_e:
case dItemNo_ORANGE_RUPEE_e:
fopAcM_seStart(this, JA_SE_OBJ_LUPY_BOUND, temp);
break;
case dItem_SMALL_MAGIC_e:
case dItem_LARGE_MAGIC_e:
case dItemNo_SMALL_MAGIC_e:
case dItemNo_LARGE_MAGIC_e:
fopAcM_seStart(this, JA_SE_OBJ_M_POT_BOUND, temp);
break;
case dItem_ARROW_10_e:
case dItem_ARROW_20_e:
case dItem_ARROW_30_e:
case dItem_MAGIC_ARROW_e:
case dItem_LIGHT_ARROW_e:
case dItemNo_ARROW_10_e:
case dItemNo_ARROW_20_e:
case dItemNo_ARROW_30_e:
case dItemNo_MAGIC_ARROW_e:
case dItemNo_LIGHT_ARROW_e:
fopAcM_seStart(this, JA_SE_CM_BST_ARROW_BOUND, temp);
break;
case dItem_HEART_PIECE_e:
case dItem_HEART_CONTAINER_e:
case dItemNo_HEART_PIECE_e:
case dItemNo_HEART_CONTAINER_e:
fopAcM_seStart(this, JA_SE_CM_BST_HEART_BOUND, temp);
break;
case dItem_BOMB_5_e:
case dItem_BOMB_10_e:
case dItem_BOMB_20_e:
case dItem_BOMB_30_e:
case dItemNo_BOMB_5_e:
case dItemNo_BOMB_10_e:
case dItemNo_BOMB_20_e:
case dItemNo_BOMB_30_e:
fopAcM_seStart(this, JA_SE_CM_BST_BOMB_BOUND, temp);
break;
}
@@ -1244,7 +1242,7 @@ void daItem_c::mode_water_init() {
scale.set(mScaleTarget.x, mScaleTarget.y, mScaleTarget.z);
cXyz particleScale;
f32 temp3 = (f32)dItem_data::getShadowSize(m_itemNo) / dItem_data::getShadowSize(dItem_GREEN_RUPEE_e);
f32 temp3 = (f32)dItem_data::getShadowSize(m_itemNo) / dItem_data::getShadowSize(dItemNo_GREEN_RUPEE_e);
temp3 *= scale.x;
particleScale.setall(temp3);
@@ -1260,43 +1258,43 @@ void daItem_c::mode_wait() {
}
switch (m_itemNo) {
case dItem_HEART_e:
case dItem_TRIPLE_HEART_e:
case dItemNo_HEART_e:
case dItemNo_TRIPLE_HEART_e:
itemActionForHeart();
break;
case dItem_HEART_PIECE_e:
case dItem_HEART_CONTAINER_e:
case dItem_BOMB_5_e:
case dItem_BOMB_10_e:
case dItem_BOMB_20_e:
case dItem_BOMB_30_e:
case dItem_ARROW_10_e:
case dItem_ARROW_20_e:
case dItem_ARROW_30_e:
case dItem_MAGIC_ARROW_e:
case dItem_LIGHT_ARROW_e:
case dItemNo_HEART_PIECE_e:
case dItemNo_HEART_CONTAINER_e:
case dItemNo_BOMB_5_e:
case dItemNo_BOMB_10_e:
case dItemNo_BOMB_20_e:
case dItemNo_BOMB_30_e:
case dItemNo_ARROW_10_e:
case dItemNo_ARROW_20_e:
case dItemNo_ARROW_30_e:
case dItemNo_MAGIC_ARROW_e:
case dItemNo_LIGHT_ARROW_e:
itemActionForArrow();
break;
case dItem_SMALL_KEY_e:
case dItemNo_SMALL_KEY_e:
itemActionForKey();
break;
case dItem_SMALL_MAGIC_e:
case dItem_LARGE_MAGIC_e:
case dItemNo_SMALL_MAGIC_e:
case dItemNo_LARGE_MAGIC_e:
#if VERSION > VERSION_DEMO
case dItem_JOY_PENDANT_e:
case dItemNo_JOY_PENDANT_e:
#endif
case dItem_SKULL_NECKLACE_e:
case dItem_BOKOBABA_SEED_e:
case dItem_GOLDEN_FEATHER_e:
case dItem_KNIGHTS_CREST_e:
case dItem_RED_JELLY_e:
case dItem_GREEN_JELLY_e:
case dItem_BLUE_JELLY_e:
case dItemNo_SKULL_NECKLACE_e:
case dItemNo_BOKOBABA_SEED_e:
case dItemNo_GOLDEN_FEATHER_e:
case dItemNo_KNIGHTS_CREST_e:
case dItemNo_RED_JELLY_e:
case dItemNo_GREEN_JELLY_e:
case dItemNo_BLUE_JELLY_e:
itemActionForEmono();
break;
case dItem_SWORD_e:
case dItem_SHIELD_e:
case dItem_DROPPED_SWORD_e:
case dItemNo_SWORD_e:
case dItemNo_SHIELD_e:
case dItemNo_DROPPED_SWORD_e:
itemActionForSword();
break;
default:
@@ -1523,18 +1521,18 @@ static actor_method_class l_daItem_Method = {
};
actor_process_profile_definition g_profile_ITEM = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_ITEM,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_ITEM_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daItem_c),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_ITEM,
/* Draw Prio */ fpcDwPi_ITEM_e,
/* Actor SubMtd */ &l_daItem_Method,
/* Status */ fopAcStts_CULL_e | fopAcStts_UNK40000_e | fopAcStts_UNK80000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};
src/d/actor/d_a_itembase.cpp
+3 -3
View File
@@ -40,12 +40,12 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1,
}
switch (m_itemNo) {
case dItem_ARROW_30_e:
case dItemNo_ARROW_30_e:
mpModelArrow[0] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002);
if (!mpModelArrow[0]) {
return FALSE;
}
case dItem_ARROW_20_e:
case dItemNo_ARROW_20_e:
mpModelArrow[1] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002);
if (!mpModelArrow[1]) {
return FALSE;
@@ -165,7 +165,7 @@ void daItemBase_c::settingBeforeDraw() {
mpModel->getModelData()->getJointNodePointer(0)->setMtxCalc(NULL);
}
if (m_itemNo == dItem_BOMB_BAG_e || m_itemNo == dItem_SKULL_HAMMER_e || m_itemNo == dItem_SMALL_KEY_e) {
if (m_itemNo == dItemNo_BOMB_BAG_e || m_itemNo == dItemNo_SKULL_HAMMER_e || m_itemNo == dItemNo_SMALL_KEY_e) {
dDlst_texSpecmapST(&eyePos, &tevStr, mpModel->getModelData(), 1.0f);
}
}
src/d/actor/d_a_jbo.cpp
+7 -9
View File
@@ -9,10 +9,8 @@
#include "d/d_com_inf_game.h"
#include "d/d_kankyo.h"
#include "d/d_s_play.h"
#include "d/d_procname.h"
#include "d/res/res_jbo.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_priority.h"
#define JUMP_ANIMATION_TIME 70
@@ -265,18 +263,18 @@ static actor_method_class l_daJBO_Method = {
};
actor_process_profile_definition g_profile_JBO = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 0x0007,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_JBO,
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_JBO_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(jbo_class),
/* SizeOther */ 0,
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ PRIO_JBO,
/* Draw Prio */ fpcDwPi_JBO_e,
/* Actor SubMtd */ &l_daJBO_Method,
/* Status */ fopAcStts_SHOWMAP_e | fopAcStts_CULL_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ENV_e,
/* CullType */ fopAc_CULLBOX_0_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};

Some files were not shown because too many files have changed in this diff Show More