mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-18 05:08:57 -04:00
Process profiles and enums cleanup (#1031)
* 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:
+9
-10
@@ -13,7 +13,6 @@
|
||||
#include "d/d_com_lib_game.h"
|
||||
#include "d/d_item_data.h"
|
||||
#include "d/d_map.h"
|
||||
#include "d/d_procname.h"
|
||||
#include "d/d_stage.h"
|
||||
#include "d/actor/d_a_salvage.h"
|
||||
#include "d/actor/d_a_npc_md.h"
|
||||
@@ -72,7 +71,7 @@ void objectSetCheck(room_of_scene_class* i_this) {
|
||||
|
||||
if (!i_this->mbReLoaded) {
|
||||
if (!hiddenFlag) {
|
||||
fopAcM_create(PROC_BG, roomNo);
|
||||
fopAcM_create(fpcNm_BG_e, roomNo);
|
||||
dStage_dt_c_roomReLoader(i_this->mpRoomData, i_this->mpRoomDt, roomNo);
|
||||
i_this->mbReLoaded = true;
|
||||
}
|
||||
@@ -257,10 +256,10 @@ cPhs_State phase_4(room_of_scene_class* i_this) {
|
||||
|
||||
setMapImage(i_this);
|
||||
|
||||
if (dComIfGs_checkGetItem(dItem_PEARL_DIN_e))
|
||||
if (dComIfGs_checkGetItem(dItemNo_PEARL_DIN_e))
|
||||
i_this->field_0x1dc = 1;
|
||||
|
||||
if (strcmp(dComIfGp_getStartStageName(), "Omori") == 0 && dComIfGs_checkGetItem(dItem_PEARL_FARORE_e))
|
||||
if (strcmp(dComIfGp_getStartStageName(), "Omori") == 0 && dComIfGs_checkGetItem(dItemNo_PEARL_FARORE_e))
|
||||
i_this->field_0x1dc = 2;
|
||||
|
||||
// Bug? The game seems to set these flags for DRI even when you're not on the sea stage.
|
||||
@@ -288,7 +287,7 @@ static cPhs_State dScnRoom_Create(scene_class* i_scn) {
|
||||
return dComLbG_PhaseHandler(&i_this->mPhs, l_method, i_this);
|
||||
}
|
||||
|
||||
scene_method_class l_dScnRoom_Method = {
|
||||
static scene_method_class l_dScnRoom_Method = {
|
||||
(process_method_func)dScnRoom_Create,
|
||||
(process_method_func)dScnRoom_Delete,
|
||||
(process_method_func)dScnRoom_Execute,
|
||||
@@ -297,13 +296,13 @@ scene_method_class l_dScnRoom_Method = {
|
||||
};
|
||||
|
||||
scene_process_profile_definition g_profile_ROOM_SCENE = {
|
||||
/* LayerID */ fpcLy_CURRENT_e,
|
||||
/* ListID */ 0,
|
||||
/* ListPrio */ fpcPi_CURRENT_e,
|
||||
/* ProcName */ PROC_ROOM_SCENE,
|
||||
/* Layer ID */ fpcLy_CURRENT_e,
|
||||
/* List ID */ 0,
|
||||
/* List Prio */ fpcPi_CURRENT_e,
|
||||
/* Proc Name */ fpcNm_ROOM_SCENE_e,
|
||||
/* Proc SubMtd */ &g_fpcNd_Method.base,
|
||||
/* Size */ sizeof(room_of_scene_class),
|
||||
/* SizeOther */ 0,
|
||||
/* Size Other */ 0,
|
||||
/* Parameters */ 0,
|
||||
/* Node SubMtd */ &g_fopScn_Method.base,
|
||||
/* Scene SubMtd */ &l_dScnRoom_Method,
|
||||
|
||||
Reference in New Issue
Block a user