d_a_npc_grd matching (#2821)

* d_a_npc_grd matching

* Fix regression

* Fix
This commit is contained in:
hev7
2025-11-19 02:21:48 +00:00
committed by GitHub
parent 8a39ebfa8b
commit 1b2fe5e2e3
4 changed files with 1196 additions and 1223 deletions
+8 -2
View File
@@ -1662,8 +1662,14 @@ static int daFshop_Create(fopAc_ac_c* actor) {
fopAcM_createChild(PROC_FSHOP, fopAcM_GetID(actor), 0xFFFFFF23, &actor->current.pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1, NULL);
u8 sp10 = 1;
#if VERSION == VERSION_GCN_PAL || VERSION == VERSION_WII_PAL || PLATFORM_SHIELD
if (dComIfGs_getPalLanguage() == 1) {
#if VERSION == VERSION_GCN_PAL || VERSION == VERSION_WII_PAL
if (dComIfGs_getPalLanguage() == dSv_player_config_c::LANGAUGE_ENGLISH) {
sp10 = 2;
} else {
sp10 = 0;
}
#elif PLATFORM_SHIELD
if (dComIfGs_getPalLanguage() == dSv_player_config_c::LANGAUGE_GERMAN) {
sp10 = 2;
} else {
sp10 = 0;
+1110 -1179
View File
File diff suppressed because it is too large Load Diff