mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-06-17 06:47:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Also mark NZ_JNT as an ambiguous name

Browse Source
This commit is contained in:
LagoLunatic
2026-06-16 15:24:19 -04:00
parent 71ef7208ac
commit 08c9098dcf
15 changed files with 283 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/D44J01/res/Object/Npcnz.h
+23 -23
View File
@@ -16,29 +16,29 @@ enum dRes_ID_NPCNZ {
dRes_ID_NPCNZ_BDL_NZ_e=0x3,
};
enum NZ_JNT {
NZ_JNT_KOSI_e=0x0,
NZ_JNT_HIP_e=0x1,
NZ_JNT_HIP2_e=0x2,
NZ_JNT_MOMOL_e=0x3,
NZ_JNT_SUNEL_e=0x4,
NZ_JNT_ASHIL_e=0x5,
NZ_JNT_MOMOR_e=0x6,
NZ_JNT_SUNER_e=0x7,
NZ_JNT_ASHIR_e=0x8,
NZ_JNT_SHIPPO_e=0x9,
NZ_JNT_MUNE_e=0xA,
NZ_JNT_HEAD_e=0xB,
NZ_JNT_HANA_e=0xC,
NZ_JNT_KUTI_e=0xD,
NZ_JNT_MIMIL_e=0xE,
NZ_JNT_MIMIR_e=0xF,
NZ_JNT_UDEL_e=0x10,
NZ_JNT_UDEL2_e=0x11,
NZ_JNT_UDEL3_e=0x12,
NZ_JNT_UDER_e=0x13,
NZ_JNT_UDER2_e=0x14,
NZ_JNT_UDER3_e=0x15,
enum NPCNZ_NZ_JNT {
NPCNZ_NZ_JNT_KOSI_e=0x0,
NPCNZ_NZ_JNT_HIP_e=0x1,
NPCNZ_NZ_JNT_HIP2_e=0x2,
NPCNZ_NZ_JNT_MOMOL_e=0x3,
NPCNZ_NZ_JNT_SUNEL_e=0x4,
NPCNZ_NZ_JNT_ASHIL_e=0x5,
NPCNZ_NZ_JNT_MOMOR_e=0x6,
NPCNZ_NZ_JNT_SUNER_e=0x7,
NPCNZ_NZ_JNT_ASHIR_e=0x8,
NPCNZ_NZ_JNT_SHIPPO_e=0x9,
NPCNZ_NZ_JNT_MUNE_e=0xA,
NPCNZ_NZ_JNT_HEAD_e=0xB,
NPCNZ_NZ_JNT_HANA_e=0xC,
NPCNZ_NZ_JNT_KUTI_e=0xD,
NPCNZ_NZ_JNT_MIMIL_e=0xE,
NPCNZ_NZ_JNT_MIMIR_e=0xF,
NPCNZ_NZ_JNT_UDEL_e=0x10,
NPCNZ_NZ_JNT_UDEL2_e=0x11,
NPCNZ_NZ_JNT_UDEL3_e=0x12,
NPCNZ_NZ_JNT_UDER_e=0x13,
NPCNZ_NZ_JNT_UDER2_e=0x14,
NPCNZ_NZ_JNT_UDER3_e=0x15,
};
#endif /* RES_NPCNZ_H */
assets/D44J01/res/Object/Nz.h
+23 -23
View File
@@ -86,29 +86,29 @@ enum dRes_ID_NZ {
dRes_ID_NZ_BTI_SIPPO_e=0x2E,
};
enum NZ_JNT {
NZ_JNT_KOSI_e=0x0,
NZ_JNT_HIP_e=0x1,
NZ_JNT_HIP2_e=0x2,
NZ_JNT_MOMOL_e=0x3,
NZ_JNT_SUNEL_e=0x4,
NZ_JNT_ASHIL_e=0x5,
NZ_JNT_MOMOR_e=0x6,
NZ_JNT_SUNER_e=0x7,
NZ_JNT_ASHIR_e=0x8,
NZ_JNT_SHIPPO_e=0x9,
NZ_JNT_MUNE_e=0xA,
NZ_JNT_HEAD_e=0xB,
NZ_JNT_HANA_e=0xC,
NZ_JNT_KUTI_e=0xD,
NZ_JNT_MIMIL_e=0xE,
NZ_JNT_MIMIR_e=0xF,
NZ_JNT_UDEL_e=0x10,
NZ_JNT_UDEL2_e=0x11,
NZ_JNT_UDEL3_e=0x12,
NZ_JNT_UDER_e=0x13,
NZ_JNT_UDER2_e=0x14,
NZ_JNT_UDER3_e=0x15,
enum NZ_NZ_JNT {
NZ_NZ_JNT_KOSI_e=0x0,
NZ_NZ_JNT_HIP_e=0x1,
NZ_NZ_JNT_HIP2_e=0x2,
NZ_NZ_JNT_MOMOL_e=0x3,
NZ_NZ_JNT_SUNEL_e=0x4,
NZ_NZ_JNT_ASHIL_e=0x5,
NZ_NZ_JNT_MOMOR_e=0x6,
NZ_NZ_JNT_SUNER_e=0x7,
NZ_NZ_JNT_ASHIR_e=0x8,
NZ_NZ_JNT_SHIPPO_e=0x9,
NZ_NZ_JNT_MUNE_e=0xA,
NZ_NZ_JNT_HEAD_e=0xB,
NZ_NZ_JNT_HANA_e=0xC,
NZ_NZ_JNT_KUTI_e=0xD,
NZ_NZ_JNT_MIMIL_e=0xE,
NZ_NZ_JNT_MIMIR_e=0xF,
NZ_NZ_JNT_UDEL_e=0x10,
NZ_NZ_JNT_UDEL2_e=0x11,
NZ_NZ_JNT_UDEL3_e=0x12,
NZ_NZ_JNT_UDER_e=0x13,
NZ_NZ_JNT_UDER2_e=0x14,
NZ_NZ_JNT_UDER3_e=0x15,
};
#endif /* RES_NZ_H */
assets/D44J01/res/Object/Pfall.h
+23 -23
View File
@@ -34,29 +34,29 @@ enum AOTSI_JNT {
AOTSI_JNT_AOTSI_e=0x0,
};
enum NZ_JNT {
NZ_JNT_KOSI_e=0x0,
NZ_JNT_HIP_e=0x1,
NZ_JNT_HIP2_e=0x2,
NZ_JNT_MOMOL_e=0x3,
NZ_JNT_SUNEL_e=0x4,
NZ_JNT_ASHIL_e=0x5,
NZ_JNT_MOMOR_e=0x6,
NZ_JNT_SUNER_e=0x7,
NZ_JNT_ASHIR_e=0x8,
NZ_JNT_SHIPPO_e=0x9,
NZ_JNT_MUNE_e=0xA,
NZ_JNT_HEAD_e=0xB,
NZ_JNT_HANA_e=0xC,
NZ_JNT_KUTI_e=0xD,
NZ_JNT_MIMIL_e=0xE,
NZ_JNT_MIMIR_e=0xF,
NZ_JNT_UDEL_e=0x10,
NZ_JNT_UDEL2_e=0x11,
NZ_JNT_UDEL3_e=0x12,
NZ_JNT_UDER_e=0x13,
NZ_JNT_UDER2_e=0x14,
NZ_JNT_UDER3_e=0x15,
enum PFALL_NZ_JNT {
PFALL_NZ_JNT_KOSI_e=0x0,
PFALL_NZ_JNT_HIP_e=0x1,
PFALL_NZ_JNT_HIP2_e=0x2,
PFALL_NZ_JNT_MOMOL_e=0x3,
PFALL_NZ_JNT_SUNEL_e=0x4,
PFALL_NZ_JNT_ASHIL_e=0x5,
PFALL_NZ_JNT_MOMOR_e=0x6,
PFALL_NZ_JNT_SUNER_e=0x7,
PFALL_NZ_JNT_ASHIR_e=0x8,
PFALL_NZ_JNT_SHIPPO_e=0x9,
PFALL_NZ_JNT_MUNE_e=0xA,
PFALL_NZ_JNT_HEAD_e=0xB,
PFALL_NZ_JNT_HANA_e=0xC,
PFALL_NZ_JNT_KUTI_e=0xD,
PFALL_NZ_JNT_MIMIL_e=0xE,
PFALL_NZ_JNT_MIMIR_e=0xF,
PFALL_NZ_JNT_UDEL_e=0x10,
PFALL_NZ_JNT_UDEL2_e=0x11,
PFALL_NZ_JNT_UDEL3_e=0x12,
PFALL_NZ_JNT_UDER_e=0x13,
PFALL_NZ_JNT_UDER2_e=0x14,
PFALL_NZ_JNT_UDER3_e=0x15,
};
enum PSUZU_JNT {
assets/GZLE01/res/Object/Npcnz.h
+23 -23
View File
@@ -16,29 +16,29 @@ enum dRes_ID_NPCNZ {
dRes_ID_NPCNZ_BDL_NZ_e=0x3,
};
enum NZ_JNT {
NZ_JNT_KOSI_e=0x0,
NZ_JNT_HIP_e=0x1,
NZ_JNT_HIP2_e=0x2,
NZ_JNT_MOMOL_e=0x3,
NZ_JNT_SUNEL_e=0x4,
NZ_JNT_ASHIL_e=0x5,
NZ_JNT_MOMOR_e=0x6,
NZ_JNT_SUNER_e=0x7,
NZ_JNT_ASHIR_e=0x8,
NZ_JNT_SHIPPO_e=0x9,
NZ_JNT_MUNE_e=0xA,
NZ_JNT_HEAD_e=0xB,
NZ_JNT_HANA_e=0xC,
NZ_JNT_KUTI_e=0xD,
NZ_JNT_MIMIL_e=0xE,
NZ_JNT_MIMIR_e=0xF,
NZ_JNT_UDEL_e=0x10,
NZ_JNT_UDEL2_e=0x11,
NZ_JNT_UDEL3_e=0x12,
NZ_JNT_UDER_e=0x13,
NZ_JNT_UDER2_e=0x14,
NZ_JNT_UDER3_e=0x15,
enum NPCNZ_NZ_JNT {
NPCNZ_NZ_JNT_KOSI_e=0x0,
NPCNZ_NZ_JNT_HIP_e=0x1,
NPCNZ_NZ_JNT_HIP2_e=0x2,
NPCNZ_NZ_JNT_MOMOL_e=0x3,
NPCNZ_NZ_JNT_SUNEL_e=0x4,
NPCNZ_NZ_JNT_ASHIL_e=0x5,
NPCNZ_NZ_JNT_MOMOR_e=0x6,
NPCNZ_NZ_JNT_SUNER_e=0x7,
NPCNZ_NZ_JNT_ASHIR_e=0x8,
NPCNZ_NZ_JNT_SHIPPO_e=0x9,
NPCNZ_NZ_JNT_MUNE_e=0xA,
NPCNZ_NZ_JNT_HEAD_e=0xB,
NPCNZ_NZ_JNT_HANA_e=0xC,
NPCNZ_NZ_JNT_KUTI_e=0xD,
NPCNZ_NZ_JNT_MIMIL_e=0xE,
NPCNZ_NZ_JNT_MIMIR_e=0xF,
NPCNZ_NZ_JNT_UDEL_e=0x10,
NPCNZ_NZ_JNT_UDEL2_e=0x11,
NPCNZ_NZ_JNT_UDEL3_e=0x12,
NPCNZ_NZ_JNT_UDER_e=0x13,
NPCNZ_NZ_JNT_UDER2_e=0x14,
NPCNZ_NZ_JNT_UDER3_e=0x15,
};
#endif /* RES_NPCNZ_H */
assets/GZLE01/res/Object/Nz.h
+23 -23
View File
@@ -86,29 +86,29 @@ enum dRes_ID_NZ {
dRes_ID_NZ_BTI_SIPPO_e=0x2E,
};
enum NZ_JNT {
NZ_JNT_KOSI_e=0x0,
NZ_JNT_HIP_e=0x1,
NZ_JNT_HIP2_e=0x2,
NZ_JNT_MOMOL_e=0x3,
NZ_JNT_SUNEL_e=0x4,
NZ_JNT_ASHIL_e=0x5,
NZ_JNT_MOMOR_e=0x6,
NZ_JNT_SUNER_e=0x7,
NZ_JNT_ASHIR_e=0x8,
NZ_JNT_SHIPPO_e=0x9,
NZ_JNT_MUNE_e=0xA,
NZ_JNT_HEAD_e=0xB,
NZ_JNT_HANA_e=0xC,
NZ_JNT_KUTI_e=0xD,
NZ_JNT_MIMIL_e=0xE,
NZ_JNT_MIMIR_e=0xF,
NZ_JNT_UDEL_e=0x10,
NZ_JNT_UDEL2_e=0x11,
NZ_JNT_UDEL3_e=0x12,
NZ_JNT_UDER_e=0x13,
NZ_JNT_UDER2_e=0x14,
NZ_JNT_UDER3_e=0x15,
enum NZ_NZ_JNT {
NZ_NZ_JNT_KOSI_e=0x0,
NZ_NZ_JNT_HIP_e=0x1,
NZ_NZ_JNT_HIP2_e=0x2,
NZ_NZ_JNT_MOMOL_e=0x3,
NZ_NZ_JNT_SUNEL_e=0x4,
NZ_NZ_JNT_ASHIL_e=0x5,
NZ_NZ_JNT_MOMOR_e=0x6,
NZ_NZ_JNT_SUNER_e=0x7,
NZ_NZ_JNT_ASHIR_e=0x8,
NZ_NZ_JNT_SHIPPO_e=0x9,
NZ_NZ_JNT_MUNE_e=0xA,
NZ_NZ_JNT_HEAD_e=0xB,
NZ_NZ_JNT_HANA_e=0xC,
NZ_NZ_JNT_KUTI_e=0xD,
NZ_NZ_JNT_MIMIL_e=0xE,
NZ_NZ_JNT_MIMIR_e=0xF,
NZ_NZ_JNT_UDEL_e=0x10,
NZ_NZ_JNT_UDEL2_e=0x11,
NZ_NZ_JNT_UDEL3_e=0x12,
NZ_NZ_JNT_UDER_e=0x13,
NZ_NZ_JNT_UDER2_e=0x14,
NZ_NZ_JNT_UDER3_e=0x15,
};
#endif /* RES_NZ_H */
assets/GZLE01/res/Object/Pfall.h
+23 -23
View File
@@ -34,29 +34,29 @@ enum AOTSI_JNT {
AOTSI_JNT_AOTSI_e=0x0,
};
enum NZ_JNT {
NZ_JNT_KOSI_e=0x0,
NZ_JNT_HIP_e=0x1,
NZ_JNT_HIP2_e=0x2,
NZ_JNT_MOMOL_e=0x3,
NZ_JNT_SUNEL_e=0x4,
NZ_JNT_ASHIL_e=0x5,
NZ_JNT_MOMOR_e=0x6,
NZ_JNT_SUNER_e=0x7,
NZ_JNT_ASHIR_e=0x8,
NZ_JNT_SHIPPO_e=0x9,
NZ_JNT_MUNE_e=0xA,
NZ_JNT_HEAD_e=0xB,
NZ_JNT_HANA_e=0xC,
NZ_JNT_KUTI_e=0xD,
NZ_JNT_MIMIL_e=0xE,
NZ_JNT_MIMIR_e=0xF,
NZ_JNT_UDEL_e=0x10,
NZ_JNT_UDEL2_e=0x11,
NZ_JNT_UDEL3_e=0x12,
NZ_JNT_UDER_e=0x13,
NZ_JNT_UDER2_e=0x14,
NZ_JNT_UDER3_e=0x15,
enum PFALL_NZ_JNT {
PFALL_NZ_JNT_KOSI_e=0x0,
PFALL_NZ_JNT_HIP_e=0x1,
PFALL_NZ_JNT_HIP2_e=0x2,
PFALL_NZ_JNT_MOMOL_e=0x3,
PFALL_NZ_JNT_SUNEL_e=0x4,
PFALL_NZ_JNT_ASHIL_e=0x5,
PFALL_NZ_JNT_MOMOR_e=0x6,
PFALL_NZ_JNT_SUNER_e=0x7,
PFALL_NZ_JNT_ASHIR_e=0x8,
PFALL_NZ_JNT_SHIPPO_e=0x9,
PFALL_NZ_JNT_MUNE_e=0xA,
PFALL_NZ_JNT_HEAD_e=0xB,
PFALL_NZ_JNT_HANA_e=0xC,
PFALL_NZ_JNT_KUTI_e=0xD,
PFALL_NZ_JNT_MIMIL_e=0xE,
PFALL_NZ_JNT_MIMIR_e=0xF,
PFALL_NZ_JNT_UDEL_e=0x10,
PFALL_NZ_JNT_UDEL2_e=0x11,
PFALL_NZ_JNT_UDEL3_e=0x12,
PFALL_NZ_JNT_UDER_e=0x13,
PFALL_NZ_JNT_UDER2_e=0x14,
PFALL_NZ_JNT_UDER3_e=0x15,
};
enum PSUZU_JNT {
assets/GZLJ01/res/Object/Npcnz.h
+23 -23
View File
@@ -16,29 +16,29 @@ enum dRes_ID_NPCNZ {
dRes_ID_NPCNZ_BDL_NZ_e=0x3,
};
enum NZ_JNT {
NZ_JNT_KOSI_e=0x0,
NZ_JNT_HIP_e=0x1,
NZ_JNT_HIP2_e=0x2,
NZ_JNT_MOMOL_e=0x3,
NZ_JNT_SUNEL_e=0x4,
NZ_JNT_ASHIL_e=0x5,
NZ_JNT_MOMOR_e=0x6,
NZ_JNT_SUNER_e=0x7,
NZ_JNT_ASHIR_e=0x8,
NZ_JNT_SHIPPO_e=0x9,
NZ_JNT_MUNE_e=0xA,
NZ_JNT_HEAD_e=0xB,
NZ_JNT_HANA_e=0xC,
NZ_JNT_KUTI_e=0xD,
NZ_JNT_MIMIL_e=0xE,
NZ_JNT_MIMIR_e=0xF,
NZ_JNT_UDEL_e=0x10,
NZ_JNT_UDEL2_e=0x11,
NZ_JNT_UDEL3_e=0x12,
NZ_JNT_UDER_e=0x13,
NZ_JNT_UDER2_e=0x14,
NZ_JNT_UDER3_e=0x15,
enum NPCNZ_NZ_JNT {
NPCNZ_NZ_JNT_KOSI_e=0x0,
NPCNZ_NZ_JNT_HIP_e=0x1,
NPCNZ_NZ_JNT_HIP2_e=0x2,
NPCNZ_NZ_JNT_MOMOL_e=0x3,
NPCNZ_NZ_JNT_SUNEL_e=0x4,
NPCNZ_NZ_JNT_ASHIL_e=0x5,
NPCNZ_NZ_JNT_MOMOR_e=0x6,
NPCNZ_NZ_JNT_SUNER_e=0x7,
NPCNZ_NZ_JNT_ASHIR_e=0x8,
NPCNZ_NZ_JNT_SHIPPO_e=0x9,
NPCNZ_NZ_JNT_MUNE_e=0xA,
NPCNZ_NZ_JNT_HEAD_e=0xB,
NPCNZ_NZ_JNT_HANA_e=0xC,
NPCNZ_NZ_JNT_KUTI_e=0xD,
NPCNZ_NZ_JNT_MIMIL_e=0xE,
NPCNZ_NZ_JNT_MIMIR_e=0xF,
NPCNZ_NZ_JNT_UDEL_e=0x10,
NPCNZ_NZ_JNT_UDEL2_e=0x11,
NPCNZ_NZ_JNT_UDEL3_e=0x12,
NPCNZ_NZ_JNT_UDER_e=0x13,
NPCNZ_NZ_JNT_UDER2_e=0x14,
NPCNZ_NZ_JNT_UDER3_e=0x15,
};
#endif /* RES_NPCNZ_H */
assets/GZLJ01/res/Object/Nz.h
+23 -23
View File
@@ -86,29 +86,29 @@ enum dRes_ID_NZ {
dRes_ID_NZ_BTI_SIPPO_e=0x2E,
};
enum NZ_JNT {
NZ_JNT_KOSI_e=0x0,
NZ_JNT_HIP_e=0x1,
NZ_JNT_HIP2_e=0x2,
NZ_JNT_MOMOL_e=0x3,
NZ_JNT_SUNEL_e=0x4,
NZ_JNT_ASHIL_e=0x5,
NZ_JNT_MOMOR_e=0x6,
NZ_JNT_SUNER_e=0x7,
NZ_JNT_ASHIR_e=0x8,
NZ_JNT_SHIPPO_e=0x9,
NZ_JNT_MUNE_e=0xA,
NZ_JNT_HEAD_e=0xB,
NZ_JNT_HANA_e=0xC,
NZ_JNT_KUTI_e=0xD,
NZ_JNT_MIMIL_e=0xE,
NZ_JNT_MIMIR_e=0xF,
NZ_JNT_UDEL_e=0x10,
NZ_JNT_UDEL2_e=0x11,
NZ_JNT_UDEL3_e=0x12,
NZ_JNT_UDER_e=0x13,
NZ_JNT_UDER2_e=0x14,
NZ_JNT_UDER3_e=0x15,
enum NZ_NZ_JNT {
NZ_NZ_JNT_KOSI_e=0x0,
NZ_NZ_JNT_HIP_e=0x1,
NZ_NZ_JNT_HIP2_e=0x2,
NZ_NZ_JNT_MOMOL_e=0x3,
NZ_NZ_JNT_SUNEL_e=0x4,
NZ_NZ_JNT_ASHIL_e=0x5,
NZ_NZ_JNT_MOMOR_e=0x6,
NZ_NZ_JNT_SUNER_e=0x7,
NZ_NZ_JNT_ASHIR_e=0x8,
NZ_NZ_JNT_SHIPPO_e=0x9,
NZ_NZ_JNT_MUNE_e=0xA,
NZ_NZ_JNT_HEAD_e=0xB,
NZ_NZ_JNT_HANA_e=0xC,
NZ_NZ_JNT_KUTI_e=0xD,
NZ_NZ_JNT_MIMIL_e=0xE,
NZ_NZ_JNT_MIMIR_e=0xF,
NZ_NZ_JNT_UDEL_e=0x10,
NZ_NZ_JNT_UDEL2_e=0x11,
NZ_NZ_JNT_UDEL3_e=0x12,
NZ_NZ_JNT_UDER_e=0x13,
NZ_NZ_JNT_UDER2_e=0x14,
NZ_NZ_JNT_UDER3_e=0x15,
};
#endif /* RES_NZ_H */
assets/GZLJ01/res/Object/Pfall.h
+23 -23
View File
@@ -34,29 +34,29 @@ enum AOTSI_JNT {
AOTSI_JNT_AOTSI_e=0x0,
};
enum NZ_JNT {
NZ_JNT_KOSI_e=0x0,
NZ_JNT_HIP_e=0x1,
NZ_JNT_HIP2_e=0x2,
NZ_JNT_MOMOL_e=0x3,
NZ_JNT_SUNEL_e=0x4,
NZ_JNT_ASHIL_e=0x5,
NZ_JNT_MOMOR_e=0x6,
NZ_JNT_SUNER_e=0x7,
NZ_JNT_ASHIR_e=0x8,
NZ_JNT_SHIPPO_e=0x9,
NZ_JNT_MUNE_e=0xA,
NZ_JNT_HEAD_e=0xB,
NZ_JNT_HANA_e=0xC,
NZ_JNT_KUTI_e=0xD,
NZ_JNT_MIMIL_e=0xE,
NZ_JNT_MIMIR_e=0xF,
NZ_JNT_UDEL_e=0x10,
NZ_JNT_UDEL2_e=0x11,
NZ_JNT_UDEL3_e=0x12,
NZ_JNT_UDER_e=0x13,
NZ_JNT_UDER2_e=0x14,
NZ_JNT_UDER3_e=0x15,
enum PFALL_NZ_JNT {
PFALL_NZ_JNT_KOSI_e=0x0,
PFALL_NZ_JNT_HIP_e=0x1,
PFALL_NZ_JNT_HIP2_e=0x2,
PFALL_NZ_JNT_MOMOL_e=0x3,
PFALL_NZ_JNT_SUNEL_e=0x4,
PFALL_NZ_JNT_ASHIL_e=0x5,
PFALL_NZ_JNT_MOMOR_e=0x6,
PFALL_NZ_JNT_SUNER_e=0x7,
PFALL_NZ_JNT_ASHIR_e=0x8,
PFALL_NZ_JNT_SHIPPO_e=0x9,
PFALL_NZ_JNT_MUNE_e=0xA,
PFALL_NZ_JNT_HEAD_e=0xB,
PFALL_NZ_JNT_HANA_e=0xC,
PFALL_NZ_JNT_KUTI_e=0xD,
PFALL_NZ_JNT_MIMIL_e=0xE,
PFALL_NZ_JNT_MIMIR_e=0xF,
PFALL_NZ_JNT_UDEL_e=0x10,
PFALL_NZ_JNT_UDEL2_e=0x11,
PFALL_NZ_JNT_UDEL3_e=0x12,
PFALL_NZ_JNT_UDER_e=0x13,
PFALL_NZ_JNT_UDER2_e=0x14,
PFALL_NZ_JNT_UDER3_e=0x15,
};
enum PSUZU_JNT {
assets/GZLP01/res/Object/Npcnz.h
+23 -23
View File
@@ -16,29 +16,29 @@ enum dRes_ID_NPCNZ {
dRes_ID_NPCNZ_BDL_NZ_e=0x3,
};
enum NZ_JNT {
NZ_JNT_KOSI_e=0x0,
NZ_JNT_HIP_e=0x1,
NZ_JNT_HIP2_e=0x2,
NZ_JNT_MOMOL_e=0x3,
NZ_JNT_SUNEL_e=0x4,
NZ_JNT_ASHIL_e=0x5,
NZ_JNT_MOMOR_e=0x6,
NZ_JNT_SUNER_e=0x7,
NZ_JNT_ASHIR_e=0x8,
NZ_JNT_SHIPPO_e=0x9,
NZ_JNT_MUNE_e=0xA,
NZ_JNT_HEAD_e=0xB,
NZ_JNT_HANA_e=0xC,
NZ_JNT_KUTI_e=0xD,
NZ_JNT_MIMIL_e=0xE,
NZ_JNT_MIMIR_e=0xF,
NZ_JNT_UDEL_e=0x10,
NZ_JNT_UDEL2_e=0x11,
NZ_JNT_UDEL3_e=0x12,
NZ_JNT_UDER_e=0x13,
NZ_JNT_UDER2_e=0x14,
NZ_JNT_UDER3_e=0x15,
enum NPCNZ_NZ_JNT {
NPCNZ_NZ_JNT_KOSI_e=0x0,
NPCNZ_NZ_JNT_HIP_e=0x1,
NPCNZ_NZ_JNT_HIP2_e=0x2,
NPCNZ_NZ_JNT_MOMOL_e=0x3,
NPCNZ_NZ_JNT_SUNEL_e=0x4,
NPCNZ_NZ_JNT_ASHIL_e=0x5,
NPCNZ_NZ_JNT_MOMOR_e=0x6,
NPCNZ_NZ_JNT_SUNER_e=0x7,
NPCNZ_NZ_JNT_ASHIR_e=0x8,
NPCNZ_NZ_JNT_SHIPPO_e=0x9,
NPCNZ_NZ_JNT_MUNE_e=0xA,
NPCNZ_NZ_JNT_HEAD_e=0xB,
NPCNZ_NZ_JNT_HANA_e=0xC,
NPCNZ_NZ_JNT_KUTI_e=0xD,
NPCNZ_NZ_JNT_MIMIL_e=0xE,
NPCNZ_NZ_JNT_MIMIR_e=0xF,
NPCNZ_NZ_JNT_UDEL_e=0x10,
NPCNZ_NZ_JNT_UDEL2_e=0x11,
NPCNZ_NZ_JNT_UDEL3_e=0x12,
NPCNZ_NZ_JNT_UDER_e=0x13,
NPCNZ_NZ_JNT_UDER2_e=0x14,
NPCNZ_NZ_JNT_UDER3_e=0x15,
};
#endif /* RES_NPCNZ_H */
assets/GZLP01/res/Object/Nz.h
+23 -23
View File
@@ -86,29 +86,29 @@ enum dRes_ID_NZ {
dRes_ID_NZ_BTI_SIPPO_e=0x2E,
};
enum NZ_JNT {
NZ_JNT_KOSI_e=0x0,
NZ_JNT_HIP_e=0x1,
NZ_JNT_HIP2_e=0x2,
NZ_JNT_MOMOL_e=0x3,
NZ_JNT_SUNEL_e=0x4,
NZ_JNT_ASHIL_e=0x5,
NZ_JNT_MOMOR_e=0x6,
NZ_JNT_SUNER_e=0x7,
NZ_JNT_ASHIR_e=0x8,
NZ_JNT_SHIPPO_e=0x9,
NZ_JNT_MUNE_e=0xA,
NZ_JNT_HEAD_e=0xB,
NZ_JNT_HANA_e=0xC,
NZ_JNT_KUTI_e=0xD,
NZ_JNT_MIMIL_e=0xE,
NZ_JNT_MIMIR_e=0xF,
NZ_JNT_UDEL_e=0x10,
NZ_JNT_UDEL2_e=0x11,
NZ_JNT_UDEL3_e=0x12,
NZ_JNT_UDER_e=0x13,
NZ_JNT_UDER2_e=0x14,
NZ_JNT_UDER3_e=0x15,
enum NZ_NZ_JNT {
NZ_NZ_JNT_KOSI_e=0x0,
NZ_NZ_JNT_HIP_e=0x1,
NZ_NZ_JNT_HIP2_e=0x2,
NZ_NZ_JNT_MOMOL_e=0x3,
NZ_NZ_JNT_SUNEL_e=0x4,
NZ_NZ_JNT_ASHIL_e=0x5,
NZ_NZ_JNT_MOMOR_e=0x6,
NZ_NZ_JNT_SUNER_e=0x7,
NZ_NZ_JNT_ASHIR_e=0x8,
NZ_NZ_JNT_SHIPPO_e=0x9,
NZ_NZ_JNT_MUNE_e=0xA,
NZ_NZ_JNT_HEAD_e=0xB,
NZ_NZ_JNT_HANA_e=0xC,
NZ_NZ_JNT_KUTI_e=0xD,
NZ_NZ_JNT_MIMIL_e=0xE,
NZ_NZ_JNT_MIMIR_e=0xF,
NZ_NZ_JNT_UDEL_e=0x10,
NZ_NZ_JNT_UDEL2_e=0x11,
NZ_NZ_JNT_UDEL3_e=0x12,
NZ_NZ_JNT_UDER_e=0x13,
NZ_NZ_JNT_UDER2_e=0x14,
NZ_NZ_JNT_UDER3_e=0x15,
};
#endif /* RES_NZ_H */
assets/GZLP01/res/Object/Pfall.h
+23 -23
View File
@@ -34,29 +34,29 @@ enum AOTSI_JNT {
AOTSI_JNT_AOTSI_e=0x0,
};
enum NZ_JNT {
NZ_JNT_KOSI_e=0x0,
NZ_JNT_HIP_e=0x1,
NZ_JNT_HIP2_e=0x2,
NZ_JNT_MOMOL_e=0x3,
NZ_JNT_SUNEL_e=0x4,
NZ_JNT_ASHIL_e=0x5,
NZ_JNT_MOMOR_e=0x6,
NZ_JNT_SUNER_e=0x7,
NZ_JNT_ASHIR_e=0x8,
NZ_JNT_SHIPPO_e=0x9,
NZ_JNT_MUNE_e=0xA,
NZ_JNT_HEAD_e=0xB,
NZ_JNT_HANA_e=0xC,
NZ_JNT_KUTI_e=0xD,
NZ_JNT_MIMIL_e=0xE,
NZ_JNT_MIMIR_e=0xF,
NZ_JNT_UDEL_e=0x10,
NZ_JNT_UDEL2_e=0x11,
NZ_JNT_UDEL3_e=0x12,
NZ_JNT_UDER_e=0x13,
NZ_JNT_UDER2_e=0x14,
NZ_JNT_UDER3_e=0x15,
enum PFALL_NZ_JNT {
PFALL_NZ_JNT_KOSI_e=0x0,
PFALL_NZ_JNT_HIP_e=0x1,
PFALL_NZ_JNT_HIP2_e=0x2,
PFALL_NZ_JNT_MOMOL_e=0x3,
PFALL_NZ_JNT_SUNEL_e=0x4,
PFALL_NZ_JNT_ASHIL_e=0x5,
PFALL_NZ_JNT_MOMOR_e=0x6,
PFALL_NZ_JNT_SUNER_e=0x7,
PFALL_NZ_JNT_ASHIR_e=0x8,
PFALL_NZ_JNT_SHIPPO_e=0x9,
PFALL_NZ_JNT_MUNE_e=0xA,
PFALL_NZ_JNT_HEAD_e=0xB,
PFALL_NZ_JNT_HANA_e=0xC,
PFALL_NZ_JNT_KUTI_e=0xD,
PFALL_NZ_JNT_MIMIL_e=0xE,
PFALL_NZ_JNT_MIMIR_e=0xF,
PFALL_NZ_JNT_UDEL_e=0x10,
PFALL_NZ_JNT_UDEL2_e=0x11,
PFALL_NZ_JNT_UDEL3_e=0x12,
PFALL_NZ_JNT_UDER_e=0x13,
PFALL_NZ_JNT_UDER2_e=0x14,
PFALL_NZ_JNT_UDER3_e=0x15,
};
enum PSUZU_JNT {
src/d/actor/d_a_npc_nz.cpp
+5 -8
View File
@@ -11,10 +11,7 @@
#include "d/d_item.h"
#include "res/Object/Npcnz.h"
// Namespace hack to fix both of these res headers having a duplicated NZ_JNT enum that causes a name collision.
namespace ResNz {
#include "res/Object/Nz.h"
} // namespace ResNz
class daNpc_Nz_HIO_c : public JORReflexible {
public:
@@ -198,12 +195,12 @@ BOOL daNpc_Nz_c::_createHeap() {
if(i == m_jnt.getHeadJntNum() || i == m_jnt.getBackboneJntNum()) {
modelData->getJointNodePointer(i)->setCallBack(daNpcNz_NodeCallBack);
}
if(i == NZ_JNT_HIP_e || i == NZ_JNT_SHIPPO_e) {
if(i == NPCNZ_NZ_JNT_HIP_e || i == NPCNZ_NZ_JNT_SHIPPO_e) {
modelData->getJointNodePointer(i)->setCallBack(daNpcNz_TailNodeCallBack);
}
}
ResTIMG* img = static_cast<ResTIMG*>(dComIfG_getObjectRes(m_arc_name, ResNz::dRes_INDEX_NZ_BTI_SIPPO_e));
ResTIMG* img = static_cast<ResTIMG*>(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_NZ_BTI_SIPPO_e));
if (field_0x934.init(1, 10, img, FALSE)) {
return TRUE;
} else {
@@ -413,10 +410,10 @@ void daNpc_Nz_c::setMtx() {
pScale->y = scaleY;
J3DModel* pModel = mpMorf->getModel();
mDoMtx_stack_c::copy(pModel->getAnmMtx(NZ_JNT_UDEL3_e));
mDoMtx_stack_c::copy(pModel->getAnmMtx(NPCNZ_NZ_JNT_UDEL3_e));
cXyz temp;
mDoMtx_stack_c::multVec(&cXyz::Zero, &temp);
mDoMtx_stack_c::copy(pModel->getAnmMtx(NZ_JNT_UDER3_e));
mDoMtx_stack_c::copy(pModel->getAnmMtx(NPCNZ_NZ_JNT_UDER3_e));
cXyz temp2;
mDoMtx_stack_c::multVec(&cXyz::Zero, &temp2);
cXyz temp3 = temp + temp2;
@@ -835,7 +832,7 @@ bool daNpc_Nz_c::_draw() {
J3DModel* pModel = mpMorf->getModel();
J3DModelData* pModelData = pModel->getModelData();
J3DJoint* rootJoint = pModelData->getJointNodePointer(NZ_JNT_KOSI_e);
J3DJoint* rootJoint = pModelData->getJointNodePointer(NPCNZ_NZ_JNT_KOSI_e);
J3DShape* matShape = pModelData->getMaterialNodePointer(0)->getShape();
J3DShape* matShape2 = pModelData->getMaterialNodePointer(1)->getShape();
J3DShape* matShape3 = pModelData->getMaterialNodePointer(2)->getShape();
src/d/actor/d_a_obj_pfall.cpp
+1 -1
View File
@@ -406,7 +406,7 @@ void daObj_Pfall_c::nz_draw() {
J3DModel* pModel = mpMorf->getModel();
J3DModelData* pModelData = pModel->getModelData();
J3DJoint* rootJoint = pModelData->getJointNodePointer(NZ_JNT_KOSI_e);
J3DJoint* rootJoint = pModelData->getJointNodePointer(PFALL_NZ_JNT_KOSI_e);
J3DShape* matShape = pModelData->getMaterialNodePointer(0)->getShape();
J3DShape* matShape2 = pModelData->getMaterialNodePointer(1)->getShape();
tools/converters/res_arc.py
+1
View File
@@ -34,6 +34,7 @@ THIS_MTIME = Path(__file__).stat().st_mtime
AMBIGUOUS_JOINT_ENUM_NAMES = [
"BOW_JNT",
"NZ_JNT",
]
class ArcFile(NamedTuple):