mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-10 11:55:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_cam_type OK for JPN, add style enum, fix pystts1 enum

Browse Source
This commit is contained in:
LagoLunatic
2025-05-06 22:58:20 -04:00
parent 9e65556126
commit 18fb9de306
8 changed files with 663 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_cam_param.h
+198 -40
View File
@@ -4,51 +4,209 @@
#include "dolphin/types.h"
#include "SSystem/SComponent/c_angle.h"
enum dCamStyle_e {
dCamStyle_NONE_e = -1,
/* 0x00 */ dCamStyle_NN00_e,
/* 0x01 */ dCamStyle_FN08_e,
/* 0x02 */ dCamStyle_PN05_e,
/* 0x03 */ dCamStyle_PN12_e,
/* 0x04 */ dCamStyle_EN00_e,
/* 0x05 */ dCamStyle_FN12_e,
/* 0x06 */ dCamStyle_TT01_e,
/* 0x07 */ dCamStyle_TT02_e,
/* 0x08 */ dCamStyle_TT03_e,
/* 0x09 */ dCamStyle_LA03_e,
/* 0x0A */ dCamStyle_LP01_e,
/* 0x0B */ dCamStyle_LA02_e,
/* 0x0C */ dCamStyle_FN13_e,
/* 0x0D */ dCamStyle_LH01_e,
/* 0x0E */ dCamStyle_LH02_e,
/* 0x0F */ dCamStyle_LB02_e,
/* 0x10 */ dCamStyle_LP02_e,
/* 0x11 */ dCamStyle_LP03_e,
/* 0x12 */ dCamStyle_LP04_e,
/* 0x13 */ dCamStyle_CC01_e,
/* 0x14 */ dCamStyle_CC02_e,
/* 0x15 */ dCamStyle_LL06_e,
/* 0x16 */ dCamStyle_LL08_e,
/* 0x17 */ dCamStyle_LL07_e,
/* 0x18 */ dCamStyle_LP10_e,
/* 0x19 */ dCamStyle_SN15_e,
/* 0x1A */ dCamStyle_BW07_e,
/* 0x1B */ dCamStyle_FN18_e,
/* 0x1C */ dCamStyle_JN05_e,
/* 0x1D */ dCamStyle_XN06_e,
/* 0x1E */ dCamStyle_LB01_e,
/* 0x1F */ dCamStyle_LA01_e,
/* 0x20 */ dCamStyle_BP07_e,
/* 0x21 */ dCamStyle_LW02_e,
/* 0x22 */ dCamStyle_HP16_e,
/* 0x23 */ dCamStyle_HN16_e,
/* 0x24 */ dCamStyle_BN07_e,
/* 0x25 */ dCamStyle_LP05_e,
/* 0x26 */ dCamStyle_LP06_e,
/* 0x27 */ dCamStyle_HN18_e,
/* 0x28 */ dCamStyle_FN25_e,
/* 0x29 */ dCamStyle_BP08_e,
/* 0x2A */ dCamStyle_BN08_e,
/* 0x2B */ dCamStyle_FN29_e,
/* 0x2C */ dCamStyle_SX01_e,
/* 0x2D */ dCamStyle_SY01_e,
/* 0x2E */ dCamStyle_SX02_e,
/* 0x2F */ dCamStyle_MM06_e,
/* 0x30 */ dCamStyle_MM05_e,
/* 0x31 */ dCamStyle_MM09_e,
/* 0x32 */ dCamStyle_MM04_e,
/* 0x33 */ dCamStyle_LN17_e,
/* 0x34 */ dCamStyle_QN07_e,
/* 0x35 */ dCamStyle_LE01_e,
/* 0x36 */ dCamStyle_LN01_e,
/* 0x37 */ dCamStyle_LW01_e,
/* 0x38 */ dCamStyle_GN01_e,
/* 0x39 */ dCamStyle_MM01_e,
#if VERSION == VERSION_JPN
dCamStyle_MM03_e,
#endif
/* Value comments below are for USA/PAL */
/* 0x3A */ dCamStyle_MM02_e,
/* 0x3B */ dCamStyle_MM10_e,
/* 0x3C */ dCamStyle_MM08_e,
/* 0x3D */ dCamStyle_MM83_e,
/* 0x3E */ dCamStyle_FP01_e,
/* 0x3F */ dCamStyle_ZZ00_e,
/* 0x40 */ dCamStyle_PN13_e,
/* 0x41 */ dCamStyle_FN82_e,
/* 0x42 */ dCamStyle_IN01_e,
/* 0x43 */ dCamStyle_IN02_e,
/* 0x44 */ dCamStyle_MM82_e,
/* 0x45 */ dCamStyle_LL11_e,
/* 0x46 */ dCamStyle_LL01_e,
/* 0x47 */ dCamStyle_LL02_e,
/* 0x48 */ dCamStyle_LL03_e,
/* 0x49 */ dCamStyle_LL04_e,
/* 0x4A */ dCamStyle_LL05_e,
/* 0x4B */ dCamStyle_LL10_e,
/* 0x4C */ dCamStyle_LL09_e,
/* 0x4D */ dCamStyle_LL12_e,
/* 0x4E */ dCamStyle_LL13_e,
/* 0x4F */ dCamStyle_LL14_e,
/* 0x50 */ dCamStyle_LL15_e,
/* 0x51 */ dCamStyle_LL16_e,
/* 0x52 */ dCamStyle_LL82_e,
/* 0x53 */ dCamStyle_FN01_e,
/* 0x54 */ dCamStyle_FN02_e,
/* 0x55 */ dCamStyle_FN03_e,
/* 0x56 */ dCamStyle_FN04_e,
/* 0x57 */ dCamStyle_FN06_e,
/* 0x58 */ dCamStyle_FN09_e,
/* 0x59 */ dCamStyle_FN07_e,
/* 0x5A */ dCamStyle_FN10_e,
/* 0x5B */ dCamStyle_FN14_e,
/* 0x5C */ dCamStyle_FN15_e,
/* 0x5D */ dCamStyle_FN17_e,
/* 0x5E */ dCamStyle_FN20_e,
/* 0x5F */ dCamStyle_FN21_e,
/* 0x60 */ dCamStyle_FN22_e,
/* 0x61 */ dCamStyle_FN23_e,
/* 0x62 */ dCamStyle_FN24_e,
/* 0x63 */ dCamStyle_FN26_e,
/* 0x64 */ dCamStyle_FN27_e,
/* 0x65 */ dCamStyle_FN28_e,
/* 0x66 */ dCamStyle_FN30_e,
/* 0x67 */ dCamStyle_FN31_e,
/* 0x68 */ dCamStyle_FN32_e,
/* 0x69 */ dCamStyle_FN33_e,
/* 0x6A */ dCamStyle_FN34_e,
/* 0x6B */ dCamStyle_FN35_e,
/* 0x6C */ dCamStyle_LL17_e,
/* 0x6D */ dCamStyle_FN37_e,
#if VERSION == VERSION_JPN
dCamStyle_FN38_e,
#endif
/* 0x6E */ dCamStyle_BE08_e,
/* 0x6F */ dCamStyle_BE07_e,
/* 0x70 */ dCamStyle_TT04_e,
/* 0x71 */ dCamStyle_FP38_e,
/* 0x72 */ dCamStyle_FN39_e,
/* 0x73 */ dCamStyle_MM16_e,
/* 0x74 */ dCamStyle_MM14_e,
/* 0x75 */ dCamStyle_MM15_e,
/* 0x76 */ dCamStyle_MM07_e,
/* 0x77 */ dCamStyle_FN81_e,
/* 0x78 */ dCamStyle_FN40_e,
/* 0x79 */ dCamStyle_FN41_e,
/* 0x7A */ dCamStyle_FN19_e,
/* 0x7B */ dCamStyle_LL81_e,
/* 0x7C */ dCamStyle_DD01_e,
/* 0x7D */ dCamStyle_MM19_e,
/* 0x7E */ dCamStyle_DD02_e,
/* 0x7F */ dCamStyle_FN42_e,
/* 0x80 */ dCamStyle_IN03_e,
/* 0x81 */ dCamStyle_FN43_e,
/* 0x82 */ dCamStyle_FN11_e,
/* 0x83 */ dCamStyle_MM21_e,
/* 0x84 */ dCamStyle_MM20_e,
/* 0x85 */ dCamStyle_FN05_e,
/* 0x86 */ dCamStyle_FN36_e,
/* 0x87 */ dCamStyle_MM81_e,
/* 0x88 */ dCamStyle_SS01_e,
/* 0x89 */ dCamStyle_LL18_e,
/* 0x8A */ dCamStyle_DD04_e,
/* 0x8B */ dCamStyle_MM22_e,
/* 0x8C */ dCamStyle_MM18_e,
/* 0x8D */ dCamStyle_MM17_e,
#if VERSION != VERSION_JPN
/* 0x8E */ dCamStyle_MM03_e,
/* 0x8F */ dCamStyle_MM23_e,
/* 0x90 */ dCamStyle_FN38_e,
#endif
};
// Array indexes, do not change values
enum dCamStyleParam_e {
dCamStyleParam_UNK0 = 0,
dCamStyleParam_UNK1 = 1,
dCamStyleParam_UNK2 = 2,
dCamStyleParam_UNK3 = 3,
dCamStyleParam_UNK4 = 4,
dCamStyleParam_CENTER_HEIGHT_BASE = 5,
dCamStyleParam_CENTER_HEIGHT_UPPER = 6,
dCamStyleParam_CENTER_HEIGHT_LOWER = 7,
dCamStyleParam_LOCKON_CENTER_HEIGHT_MIN = 8,
dCamStyleParam_LOCKON_CENTER_HEIGHT_MAX = 9,
dCamStyleParam_UNK10 = 10,
dCamStyleParam_UNK11 = 11,
dCamStyleParam_UNK12 = 12,
dCamStyleParam_UNK13 = 13,
dCamStyleParam_UNK14 = 14,
dCamStyleParam_UNK15 = 15,
dCamStyleParam_UNK16 = 16,
dCamStyleParam_UNK17 = 17,
dCamStyleParam_LOCKON_LATITUDE_MIN = 18,
dCamStyleParam_LOCKON_LATITUDE_MAX = 19,
dCamStyleParam_UNK20 = 20,
dCamStyleParam_UNK21 = 21,
dCamStyleParam_UNK22 = 22,
dCamStyleParam_LOCKON_LONGITUDE_MIN = 23,
dCamStyleParam_LOCKON_LONGITUDE_MAX = 24,
dCamStyleParam_FOVY_BASE = 25,
dCamStyleParam_FOVY_UPPER = 26,
dCamStyleParam_FOVY_LOWER = 27,
dCamStyleParam_LOCKON_FOVY_MIN = 28,
dCamStyleParam_LOCKON_FOVY_MAX = 29,
/* 0x00 */ dCamStyleParam_UNK0 = 0,
/* 0x01 */ dCamStyleParam_UNK1 = 1,
/* 0x02 */ dCamStyleParam_UNK2 = 2,
/* 0x03 */ dCamStyleParam_UNK3 = 3,
/* 0x04 */ dCamStyleParam_UNK4 = 4,
/* 0x05 */ dCamStyleParam_CENTER_HEIGHT_BASE = 5,
/* 0x06 */ dCamStyleParam_CENTER_HEIGHT_UPPER = 6,
/* 0x07 */ dCamStyleParam_CENTER_HEIGHT_LOWER = 7,
/* 0x08 */ dCamStyleParam_LOCKON_CENTER_HEIGHT_MIN = 8,
/* 0x09 */ dCamStyleParam_LOCKON_CENTER_HEIGHT_MAX = 9,
/* 0x0A */ dCamStyleParam_UNK10 = 10,
/* 0x0B */ dCamStyleParam_UNK11 = 11,
/* 0x0C */ dCamStyleParam_UNK12 = 12,
/* 0x0D */ dCamStyleParam_UNK13 = 13,
/* 0x0E */ dCamStyleParam_UNK14 = 14,
/* 0x0F */ dCamStyleParam_UNK15 = 15,
/* 0x10 */ dCamStyleParam_UNK16 = 16,
/* 0x11 */ dCamStyleParam_UNK17 = 17,
/* 0x12 */ dCamStyleParam_LOCKON_LATITUDE_MIN = 18,
/* 0x13 */ dCamStyleParam_LOCKON_LATITUDE_MAX = 19,
/* 0x14 */ dCamStyleParam_UNK20 = 20,
/* 0x15 */ dCamStyleParam_UNK21 = 21,
/* 0x16 */ dCamStyleParam_UNK22 = 22,
/* 0x17 */ dCamStyleParam_LOCKON_LONGITUDE_MIN = 23,
/* 0x18 */ dCamStyleParam_LOCKON_LONGITUDE_MAX = 24,
/* 0x19 */ dCamStyleParam_FOVY_BASE = 25,
/* 0x1A */ dCamStyleParam_FOVY_UPPER = 26,
/* 0x1B */ dCamStyleParam_FOVY_LOWER = 27,
/* 0x1C */ dCamStyleParam_LOCKON_FOVY_MIN = 28,
/* 0x1D */ dCamStyleParam_LOCKON_FOVY_MAX = 29,
};
enum dCamParamFlag_e {
dCamParam_UNK001 = 0x001,
dCamParam_UNK002 = 0x002,
dCamParam_UNK004 = 0x004,
dCamParam_UNK010 = 0x010,
dCamParam_UNK020 = 0x020,
dCamParam_UNK040 = 0x040,
dCamParam_UNK080 = 0x080,
dCamParam_UNK100 = 0x100,
dCamParam_UNK200 = 0x200,
dCamParam_UNK400 = 0x400,
dCamPrmFlg_UNK001 = 0x001,
dCamPrmFlg_UNK002 = 0x002,
dCamPrmFlg_UNK004 = 0x004,
dCamPrmFlg_UNK010 = 0x010,
dCamPrmFlg_UNK020 = 0x020,
dCamPrmFlg_UNK040 = 0x040,
dCamPrmFlg_UNK080 = 0x080,
dCamPrmFlg_UNK100 = 0x100,
dCamPrmFlg_UNK200 = 0x200,
dCamPrmFlg_UNK400 = 0x400,
};
struct dCamera__Style {
include/d/d_camera.h
+1 -1
View File
@@ -27,7 +27,7 @@ struct dCamera__EventParam {
struct dCamera__Type {
/* 0x00 */ char name[24];
/* 0x18 */ s16 mStyles[2][10];
/* 0x18 */ s16 mStyles[20];
}; // Size: 0x40
struct dCamera_event_data {
include/d/d_com_inf_game.h
-12
View File
@@ -98,18 +98,6 @@ enum daPy__PlayerStatus1 {
daPyStts1_UNK20000_e = 0x00020000,
daPyStts1_UNK40000_e = 0x00040000,
daPyStts1_UNK80000_e = 0x00080000,
daPyStts1_UNK100000_e = 0x00100000,
daPyStts1_UNK200000_e = 0x00200000,
daPyStts1_UNK400000_e = 0x00400000,
daPyStts1_UNK800000_e = 0x00800000,
daPyStts1_UNK1000000_e = 0x01000000,
daPyStts1_UNK2000000_e = 0x02000000,
daPyStts1_UNK4000000_e = 0x04000000,
daPyStts1_UNK8000000_e = 0x08000000,
daPyStts1_UNK10000000_e = 0x10000000,
daPyStts1_UNK20000000_e = 0x20000000,
daPyStts1_UNK40000000_e = 0x40000000,
daPyStts1_UNK80000000_e = 0x80000000,
};
class __d_timer_info_c {