mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-26 10:21:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Actor status consolidation & process profile definition editing (#3117)

Browse Source 
* Consolidate fopAcM_STATUS into fopAc_Status_e

* Add _e suffix to fopAcStts enums

* Prepare for profile enumeration
* Correct typo in scene_process_profile_definition
* Manually handle g_profile_Obj_DamCps (inline preprocessing)
* Correct g_profile_TAG_LV5SOUP procname to enum
* Create d_priority.h

* Update process profile definitions
* Moved inline comments to the left
* Add missing fopAcStts enums
* Add d_priority.h include in f_pc_leaf.h
* Manually update d_a_obj_damCps profile

* Replace fopAcStts enums replacing and anticipatory profile size correction
* Changed profile size from literal to sizeof() in anticipation of PR #3116
* Provided putative names to staff-related status enums
* Replaced appropriate literals with fopAcStts enums

* Fix borked merge

* Rename item number enums and move to d_item_data.h

* Rename process profile name & draw priority enums

* Move process profile name & draw priority enums to appropriate files
* Moved fpcNm_ enums from d/d_procname.h to f_pc/f_pc_name.h
* Moved fpcDwPi_ enums from d/d_priority.h to f_pc/f_pc_draw_priority.h

* ACTUALLY (whoops) stage merge

* Correct item mistranslation

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>

---------

Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
This commit is contained in:
Huitzi
2026-03-09 21:33:31 -04:00
committed by GitHub
parent 30e839c28b
commit 0b0fdd1f60
873 changed files with 19721 additions and 18953 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_kankyo_rain.cpp
+10 -10
View File
@@ -5037,7 +5037,7 @@ void dKyr_thunder_move() {
effect->mLightInfluence.mFluctuation = 1.0f;
dKy_efplight_set(&effect->mLightInfluence);
effect->field_0x1c = 0.6f + cM_rndF(0.4f);
fopKyM_create(PROC_KY_THUNDER, -1, NULL, NULL, NULL);
fopKyM_create(fpcNm_KY_THUNDER_e, -1, NULL, NULL, NULL);
effect->mState++;
}
} else if (strcmp(dComIfGp_getStartStageName(), "D_MN09B") == 0 && dComIfGp_event_runCheck()) {
@@ -5052,14 +5052,14 @@ void dKyr_thunder_move() {
effect->mLightInfluence.mFluctuation = 1.0f;
dKy_efplight_set(&effect->mLightInfluence);
effect->field_0x1c = 0.6f + cM_rndF(0.4f);
fopKyM_create(PROC_KY_THUNDER, -1, NULL, NULL, NULL);
fopKyM_create(fpcNm_KY_THUNDER_e, -1, NULL, NULL, NULL);
effect->mState++;
}
} else if (cM_rndF(1.0f) < 0.007f) {
effect->field_0x1c = 0.6f + cM_rndF(0.4f);
effect->mState = 11;
if (cM_rndF(1.0f) < 0.2f) {
fopKyM_create(PROC_KY_THUNDER, -1, NULL, NULL, NULL);
fopKyM_create(fpcNm_KY_THUNDER_e, -1, NULL, NULL, NULL);
}
} else if (cM_rndF(1.0f) < 0.005f && g_env_light.mThunderEff.mMode < 10 && sp10 != 1) {
effect->mLightInfluence.mPosition = camera->view.lookat.eye;
@@ -5070,7 +5070,7 @@ void dKyr_thunder_move() {
effect->mLightInfluence.mFluctuation = 1.0f;
dKy_efplight_set(&effect->mLightInfluence);
effect->field_0x1c = 0.6f + cM_rndF(0.4f);
fopKyM_create(PROC_KY_THUNDER, -1, NULL, NULL, NULL);
fopKyM_create(fpcNm_KY_THUNDER_e, -1, NULL, NULL, NULL);
effect->mState++;
}
break;
@@ -5099,7 +5099,7 @@ void dKyr_thunder_move() {
} else if (effect->mFlashTimer <= 0.5f && effect->mFlashTimer > 0.4f && cM_rndF(1.0f) < 0.3f) {
effect->field_0x1c = 0.6f + cM_rndF(0.4f);
if (cM_rndF(1.0f) < 0.05f) {
fopKyM_create(PROC_KY_THUNDER, -1, NULL, NULL, NULL);
fopKyM_create(fpcNm_KY_THUNDER_e, -1, NULL, NULL, NULL);
}
effect->mState--;
}
@@ -5318,7 +5318,7 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) {
GXColor color_reg1;
switch (dComIfGs_getCollectSmell()) {
case fpcNm_ITEM_SMELL_YELIA_POUCH:
case dItemNo_SMELL_YELIA_POUCH_e:
color_reg0.r = 0xFF;
color_reg0.g = 0xFF;
color_reg0.b = 0xFF;
@@ -5328,7 +5328,7 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) {
color_reg1.b = 0xA8;
color_reg1.a = 0xFF;
break;
case fpcNm_ITEM_SMELL_FISH:
case dItemNo_SMELL_FISH_e:
color_reg0.r = 0xFF;
color_reg0.g = 0xA1;
color_reg0.b = 0x3B;
@@ -5338,7 +5338,7 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) {
color_reg1.b = 0x32;
color_reg1.a = 0xFF;
break;
case fpcNm_ITEM_SMELL_CHILDREN:
case dItemNo_SMELL_CHILDREN_e:
color_reg0.r = 0xFF;
color_reg0.g = 0xDB;
color_reg0.b = 0xFF;
@@ -5348,7 +5348,7 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) {
color_reg1.b = 0x52;
color_reg1.a = 0xFF;
break;
case fpcNm_ITEM_SMELL_MEDICINE:
case dItemNo_SMELL_MEDICINE_e:
color_reg0.r = 0xD5;
color_reg0.g = 0xCE;
color_reg0.b = 0xA7;
@@ -5358,7 +5358,7 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) {
color_reg1.b = 0x27;
color_reg1.a = 0xFF;
break;
case fpcNm_ITEM_SMELL_POH:
case dItemNo_SMELL_POH_e:
color_reg0.r = 0xFF;
color_reg0.g = 0xC8;
color_reg0.b = 0xFF;