From 07697afbe86d02cf88edbe0320d344e81e78729e Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sat, 16 Aug 2025 17:39:08 -0400 Subject: [PATCH] Add version ifdefs for demo resource headers --- include/d/res/res_auction.h | 14 ++ include/d/res/res_bgn.h | 36 +++ include/d/res/res_bomber.h | 38 +++ include/d/res/res_demo06.h | 42 +++- include/d/res/res_demo08.h | 49 ++++ include/d/res/res_demo23.h | 145 +++++++++++ include/d/res/res_demo26.h | 12 + include/d/res/res_demo28.h | 115 +++++++++ include/d/res/res_demo32.h | 65 ++++- include/d/res/res_demo42.h | 20 ++ include/d/res/res_figure2.h | 12 + include/d/res/res_figure2a.h | 2 + include/d/res/res_figure2b.h | 2 + include/d/res/res_figure6a.h | 2 + include/d/res/res_figure6b.h | 2 + include/d/res/res_figure6c.h | 2 + include/d/res/res_gover.h | 20 +- include/d/res/res_hseki.h | 20 ++ include/d/res/res_hten1.h | 18 ++ include/d/res/res_ikadah.h | 4 + include/d/res/res_ikari.h | 9 + include/d/res/res_kmi00x.h | 2 + include/d/res/res_lkd01.h | 440 +++++++++++++++++++++++++++++++++- include/d/res/res_mgst.h | 19 ++ include/d/res/res_mgtem.h | 32 ++- include/d/res/res_mozo.h | 46 +++- include/d/res/res_open1.h | 2 + include/d/res/res_open2.h | 2 + include/d/res/res_open3.h | 2 + include/d/res/res_opening.h | 2 + include/d/res/res_ph.h | 20 ++ include/d/res/res_roten.h | 40 +++- include/d/res/res_rsh.h | 78 ++++++ include/d/res/res_sh.h | 15 ++ include/d/res/res_sitem.h | 17 ++ include/d/res/res_timer.h | 10 +- include/d/res/res_yfire_00.h | 15 ++ include/d/res/res_ylesr00.h | 36 +++ src/d/actor/d_a_ikari.cpp | 8 + src/d/actor/d_a_mozo.cpp | 8 +- src/d/actor/d_a_obj_roten.cpp | 12 +- 41 files changed, 1417 insertions(+), 18 deletions(-) diff --git a/include/d/res/res_auction.h b/include/d/res/res_auction.h index 994ed8a57..5a5004011 100644 --- a/include/d/res/res_auction.h +++ b/include/d/res/res_auction.h @@ -3,6 +3,19 @@ #include "global.h" +#if VERSION == VERSION_DEMO +enum AUCTION_RES_FILE_ID { // IDs and indexes are synced + /* ROOT */ + AUCTION_ARC_AUCTION=0x0, + + /* SCRN */ + AUCTION_BLO_AUCTION1=0x5, + AUCTION_BLO_AUCTION2=0x6, + + /* TIMG */ + AUCTION_BTI_BET_ICON=0x9, +}; +#else enum AUCTION_RES_FILE_ID { // IDs and indexes are synced /* SCRN */ AUCTION_BLO_AUCTION1=0x4, @@ -11,5 +24,6 @@ enum AUCTION_RES_FILE_ID { // IDs and indexes are synced /* TIMG */ AUCTION_BTI_BET_ICON=0x8, }; +#endif #endif /* RES_AUCTION_H */ diff --git a/include/d/res/res_bgn.h b/include/d/res/res_bgn.h index 90970eb1b..1c2a31086 100644 --- a/include/d/res/res_bgn.h +++ b/include/d/res/res_bgn.h @@ -3,6 +3,41 @@ #include "global.h" +#if VERSION == VERSION_DEMO +enum BGN_RES_FILE_ID { // IDs and indexes are synced + /* BCK */ + BGN_BCK_BGN_HEAD1=0x6, + BGN_BCK_BGN_HEAD2=0x7, + BGN_BCK_DAMAGE1=0x8, + BGN_BCK_DERU1=0x9, + BGN_BCK_JUMP1=0xA, + BGN_BCK_MODORU1=0xB, + BGN_BCK_RAKKA1=0xC, + BGN_BCK_RAKKA2=0xD, + BGN_BCK_SETTI1=0xE, + BGN_BCK_WAIT1=0xF, + BGN_BCK_WAIT2=0x10, + + /* BDLM */ + BGN_BDL_BGN_BODY1=0x13, + BGN_BDL_BGN_DEKU1=0x14, + BGN_BDL_BGN_HEAD1=0x15, + BGN_BDL_BGN_JYAKUTENA=0x16, + BGN_BDL_BGN_JYAKUTENB=0x17, + BGN_BDL_BGN_JYAKUTENC=0x18, + BGN_BDL_BGN_KUMO1=0x19, + BGN_BDL_BGN_MAIN1=0x1A, + BGN_BDL_R00=0x1B, + BGN_BDL_R0E_A=0x1C, + + /* BRK */ + BGN_BRK_BGN_JYAKUTENBC=0x1F, + + /* TEX */ + BGN_BTI_HIMO=0x22, + BGN_BTI_NOT_CUT1=0x23, +}; +#else enum BGN_RES_FILE_ID { // IDs and indexes are synced /* BCK */ BGN_BCK_BGN_HEAD1=0x6, @@ -47,5 +82,6 @@ enum BGN_RES_FILE_ID { // IDs and indexes are synced BGN_BTI_HIMO=0x2D, BGN_BTI_NOT_CUT1=0x2E, }; +#endif #endif /* RES_BGN_H */ diff --git a/include/d/res/res_bomber.h b/include/d/res/res_bomber.h index 5e6ccf03c..dc6ed2b7d 100644 --- a/include/d/res/res_bomber.h +++ b/include/d/res/res_bomber.h @@ -3,6 +3,43 @@ #include "global.h" +#if VERSION == VERSION_DEMO +enum BOMBER_RES_FILE_ID { + /* BMDC */ + BOMBER_BMD_AISI=0x1, + + /* BDL */ + BOMBER_BDL_VCANK=0x6, + + /* TEX */ + BOMBER_BTI_GAME_BATTERY=0x7, + BOMBER_BTI_GAME_BATTERY_BASE=0x8, + BOMBER_BTI_GAME_BOMB_01=0x9, + BOMBER_BTI_GAME_BOMB_02=0xA, + BOMBER_BTI_GAME_HUNE_DAMAGE=0xB, + BOMBER_BTI_GAME_RULE=0xC, + BOMBER_BTI_GAME_SHIP_NODAMAGE=0xD, + BOMBER_BTI_RUPY_NUM_DEGREE=0xE, +}; + +enum BOMBER_RES_FILE_INDEX { + /* BMDC */ + BOMBER_INDEX_BMD_AISI=0x5, + + /* BDL */ + BOMBER_INDEX_BDL_VCANK=0x8, + + /* TEX */ + BOMBER_INDEX_BTI_GAME_BATTERY=0xB, + BOMBER_INDEX_BTI_GAME_BATTERY_BASE=0xC, + BOMBER_INDEX_BTI_GAME_BOMB_01=0xD, + BOMBER_INDEX_BTI_GAME_BOMB_02=0xE, + BOMBER_INDEX_BTI_GAME_HUNE_DAMAGE=0xF, + BOMBER_INDEX_BTI_GAME_RULE=0x10, + BOMBER_INDEX_BTI_GAME_SHIP_NODAMAGE=0x11, + BOMBER_INDEX_BTI_RUPY_NUM_DEGREE=0x12, +}; +#else enum BOMBER_RES_FILE_ID { // IDs and indexes are synced /* BDL */ BOMBER_BDL_VCANK=0x5, @@ -20,5 +57,6 @@ enum BOMBER_RES_FILE_ID { // IDs and indexes are synced BOMBER_BTI_GAME_SHIP_NODAMAGE=0x11, BOMBER_BTI_RUPY_NUM_DEGREE=0x12, }; +#endif #endif /* RES_BOMBER_H */ diff --git a/include/d/res/res_demo06.h b/include/d/res/res_demo06.h index b7d495cbe..6ee5ee8aa 100644 --- a/include/d/res/res_demo06.h +++ b/include/d/res/res_demo06.h @@ -39,11 +39,13 @@ enum DEMO06_RES_FILE_ID { DEMO06_BCK_02_ZL_EW=0x25, DEMO06_BCK_BOW=0x26, DEMO06_BCK_BYE=0x27, +#if VERSION > VERSION_DEMO DEMO06_BCK_02_TARU_FLY=0x2A, DEMO06_BCK_02_TR_CD=0x2B, DEMO06_BCK_02_TR_FL=0x2C, DEMO06_BCK_02_TR_IN=0x2D, DEMO06_BCK_02_TR_RL=0x2E, +#endif #if VERSION > VERSION_JPN DEMO06_BCK_02_ZL_LOOK_MAJUTOU=0x32, #endif @@ -51,10 +53,48 @@ enum DEMO06_RES_FILE_ID { /* BDL */ DEMO06_BDL_SWA=0x28, DEMO06_BDL_SWGRIPA=0x29, +#if VERSION > VERSION_DEMO DEMO06_BDL_KTARU_02=0x2F, +#endif }; -#if VERSION <= VERSION_JPN +#if VERSION == VERSION_DEMO +enum DEMO06_RES_FILE_INDEX { + /* BTK */ + DEMO06_INDEX_BTK_02_ZL_BC=0x7, + DEMO06_INDEX_BTK_02_ZL_BW=0x8, + DEMO06_INDEX_BTK_02_ZL_CD=0x9, + DEMO06_INDEX_BTK_02_ZL_EW=0xA, + DEMO06_INDEX_BTK_CENTER=0xB, + + /* BTP */ + DEMO06_INDEX_BTP_02_ZL_AW=0xE, + DEMO06_INDEX_BTP_02_ZL_BC=0xF, + DEMO06_INDEX_BTP_02_ZL_BW=0x10, + DEMO06_INDEX_BTP_02_ZL_CD=0x11, + DEMO06_INDEX_BTP_02_ZL_CW=0x12, + DEMO06_INDEX_BTP_02_ZL_EW=0x13, + DEMO06_INDEX_BTP_HANG=0x14, + + /* STB */ + DEMO06_INDEX_STB_MAJU_SHINNYU=0x17, + + /* BCKS */ + DEMO06_INDEX_BCK_02_ZL_AW=0x1A, + DEMO06_INDEX_BCK_02_ZL_BC=0x1B, + DEMO06_INDEX_BCK_02_ZL_BW=0x1C, + DEMO06_INDEX_BCK_02_ZL_CD=0x1D, + DEMO06_INDEX_BCK_02_ZL_CW=0x1E, + DEMO06_INDEX_BCK_02_ZL_DW=0x1F, + DEMO06_INDEX_BCK_02_ZL_EW=0x20, + DEMO06_INDEX_BCK_BOW=0x21, + DEMO06_INDEX_BCK_BYE=0x22, + + /* BDL */ + DEMO06_INDEX_BDL_SWA=0x25, + DEMO06_INDEX_BDL_SWGRIPA=0x26, +}; +#elif VERSION == VERSION_JPN enum DEMO06_RES_FILE_INDEX { /* BTK */ DEMO06_INDEX_BTK_02_ZL_BC=0x7, diff --git a/include/d/res/res_demo08.h b/include/d/res/res_demo08.h index 1b74c211d..004c39281 100644 --- a/include/d/res/res_demo08.h +++ b/include/d/res/res_demo08.h @@ -6,7 +6,9 @@ enum DEMO08_RES_FILE_ID { /* STB */ DEMO08_STB_MEETSHISHIOH=0x0, +#if VERSION > VERSION_DEMO DEMO08_STB_DRAGONTALE=0x2F, +#endif /* BDL */ DEMO08_BDL_FN_COMP=0x1, @@ -49,6 +51,52 @@ enum DEMO08_RES_FILE_ID { DEMO08_BTK_GDEMO_MINAMO00=0x2E, }; +#if VERSION == VERSION_DEMO +enum DEMO08_RES_FILE_INDEX { + /* STB */ + DEMO08_INDEX_STB_MEETSHISHIOH=0x8, + + /* BDL */ + DEMO08_INDEX_BDL_FN_COMP=0xB, + DEMO08_INDEX_BDL_YW_COMP=0xC, + DEMO08_INDEX_BDL_DEMO_TACT=0xD, + + /* BCKS */ + DEMO08_INDEX_BCK_08_FN_CUT14_SOMUKE_O=0x10, + DEMO08_INDEX_BCK_08_FN_CUT14_SPEAK_L=0x11, + DEMO08_INDEX_BCK_08_FN_CUT16_JUMPYURE_O=0x12, + DEMO08_INDEX_BCK_08_FN_CUT16_SPEAK_L=0x13, + DEMO08_INDEX_BCK_08_FN_CUT5_FURIKAERI_O=0x14, + DEMO08_INDEX_BCK_08_FN_CUT5_KUTIPAKU_L=0x15, + DEMO08_INDEX_BCK_08_FN_CUT7_KUTIPAKU_L=0x16, + DEMO08_INDEX_BCK_08_FN_CUT7_WARAU_O=0x17, + DEMO08_INDEX_BCK_08_FN_CUT8_SPEAK_L=0x18, + DEMO08_INDEX_BCK_KA_FLY1=0x19, + DEMO08_INDEX_BCK_FN_SET=0x1A, + DEMO08_INDEX_BCK_08_CUT17_TACT_SPEAK=0x1B, + DEMO08_INDEX_BCK_08_FN_CUT17_TACT_SPEAK_L=0x1C, + DEMO08_INDEX_BCK_TACT=0x1D, + DEMO08_INDEX_BCK_07B_GND_CUT06_WAIT_L=0x1E, + DEMO08_INDEX_BCK_42_WINDWAIT=0x1F, + + /* BRK */ + DEMO08_INDEX_BRK_FADE_IN15F=0x22, + DEMO08_INDEX_BRK_FADE_IN45F=0x23, + DEMO08_INDEX_BRK_FADE_OUT15F=0x24, + DEMO08_INDEX_BRK_FADE_OUT30F=0x25, + DEMO08_INDEX_BRK_FADEBOX_BLACK=0x26, + DEMO08_INDEX_BRK_FADEBOX_INVISIBLE=0x27, + + /* BDLM */ + DEMO08_INDEX_BDL_BLACKFADEBOX=0x2A, + DEMO08_INDEX_BDL_BLACK_PLANE=0x2B, + DEMO08_INDEX_BDL_GN=0x2C, + DEMO08_INDEX_BDL_GDEMO_MINAMO00=0x2D, + + /* BTK */ + DEMO08_INDEX_BTK_GDEMO_MINAMO00=0x30, +}; +#else enum DEMO08_RES_FILE_INDEX { /* STB */ DEMO08_INDEX_STB_MEETSHISHIOH=0x8, @@ -94,5 +142,6 @@ enum DEMO08_RES_FILE_INDEX { /* BTK */ DEMO08_INDEX_BTK_GDEMO_MINAMO00=0x31, }; +#endif #endif /* RES_DEMO08_H */ diff --git a/include/d/res/res_demo23.h b/include/d/res/res_demo23.h index 253ac60a9..156000d8c 100644 --- a/include/d/res/res_demo23.h +++ b/include/d/res/res_demo23.h @@ -31,7 +31,9 @@ enum DEMO23_RES_FILE_ID { DEMO23_BTK_23_ZL_CUT20_FURIKAERI_O=0x15, DEMO23_BTK_23_ZL_CUT20_FURIKAERIWAIT_L=0x16, DEMO23_BTK_23_ZL_CUT20_RUN_O=0x17, +#if VERSION > VERSION_DEMO DEMO23_BTK_LS_DEMOLOOK=0x82, +#endif /* BTP */ DEMO23_BTP_23_LS_CUT04_ORIWAIT_L=0x18, @@ -145,6 +147,148 @@ enum DEMO23_RES_FILE_ID { DEMO23_BDL_PM=0x80, }; +#if VERSION == VERSION_DEMO +enum DEMO23_RES_FILE_INDEX { + /* STB */ + DEMO23_INDEX_STB_RESCUE=0x8, + + /* BTK */ + DEMO23_INDEX_BTK_23_LS_CUT04_TURN=0xB, + DEMO23_INDEX_BTK_23_LS_CUT05_TETORALOOK_O=0xC, + DEMO23_INDEX_BTK_23_LS_CUT10_CRYWAIT_L=0xD, + DEMO23_INDEX_BTK_23_LS_CUT10_WARAU_O=0xE, + DEMO23_INDEX_BTK_23_LS_CUT13_LOOKTETORA_L=0xF, + DEMO23_INDEX_BTK_23_LS_CUT13_LOOKTORINK_O=0x10, + DEMO23_INDEX_BTK_23_ZL_CUT06_KIZUKU_O=0x11, + DEMO23_INDEX_BTK_23_ZL_CUT06_MEIREI_L=0x12, + DEMO23_INDEX_BTK_23_ZL_CUT06_WAIT_L=0x13, + DEMO23_INDEX_BTK_23_ZL_CUT08_KIZUKUWAIT_L=0x14, + DEMO23_INDEX_BTK_23_ZL_CUT08_OPEN_O=0x15, + DEMO23_INDEX_BTK_23_ZL_CUT08_OPENWAIT_L=0x16, + DEMO23_INDEX_BTK_23_ZL_CUT12_HANDUP_O=0x17, + DEMO23_INDEX_BTK_23_ZL_CUT12_HANDUPWAIT_L=0x18, + DEMO23_INDEX_BTK_23_ZL_CUT13_HANDPOINT_O=0x19, + DEMO23_INDEX_BTK_23_ZL_CUT13_HANDPOINTWAIT_L=0x1A, + DEMO23_INDEX_BTK_23_ZL_CUT14_LOOKG_O=0x1B, + DEMO23_INDEX_BTK_23_ZL_CUT14_LOOKGB_O=0x1C, + DEMO23_INDEX_BTK_23_ZL_CUT14_LOOKGBWAIT_L=0x1D, + DEMO23_INDEX_BTK_23_ZL_CUT14_LOOKGWAIT_L=0x1E, + DEMO23_INDEX_BTK_23_ZL_CUT20_FURIKAERI_O=0x1F, + DEMO23_INDEX_BTK_23_ZL_CUT20_FURIKAERIWAIT_L=0x20, + DEMO23_INDEX_BTK_23_ZL_CUT20_RUN_O=0x21, + + /* BTP */ + DEMO23_INDEX_BTP_23_LS_CUT04_ORIWAIT_L=0x24, + DEMO23_INDEX_BTP_23_LS_CUT04_TURNWAIT_L=0x25, + DEMO23_INDEX_BTP_23_LS_CUT05_RUNWAIT_L=0x26, + DEMO23_INDEX_BTP_23_LS_CUT05_TETORLOOKWAIT_L=0x27, + DEMO23_INDEX_BTP_23_LS_CUT10_CRYWAIT_L=0x28, + DEMO23_INDEX_BTP_23_LS_CUT13_LOOKTETORA_L=0x29, + DEMO23_INDEX_BTP_23_LS_CUT13_LOOKWAIT_L=0x2A, + DEMO23_INDEX_BTP_23_LS_CUT16_TAKEOUTRUN_L=0x2B, + DEMO23_INDEX_BTP_23_ZL_CUT06_MEIREI_L=0x2C, + DEMO23_INDEX_BTP_23_ZL_CUT06_WAIT_L=0x2D, + DEMO23_INDEX_BTP_23_ZL_CUT08_KIZUKUWAIT_L=0x2E, + DEMO23_INDEX_BTP_23_ZL_CUT08_OPENWAIT_L=0x2F, + DEMO23_INDEX_BTP_23_ZL_CUT12_HANDUPWAIT_L=0x30, + DEMO23_INDEX_BTP_23_ZL_CUT13_HANDPOINTWAIT_L=0x31, + DEMO23_INDEX_BTP_23_ZL_CUT14_LOOKGBWAIT_L=0x32, + DEMO23_INDEX_BTP_23_ZL_CUT14_LOOKGWAIT_L=0x33, + DEMO23_INDEX_BTP_23_ZL_CUT20_FURIKAERIWAIT_L=0x34, + DEMO23_INDEX_BTP_23_P1A_CUT07_KEY_L=0x35, + DEMO23_INDEX_BTP_23_P1A_CUT14_HANDUPWAIT_L=0x36, + DEMO23_INDEX_BTP_23_P1A_CUT16_TAKEOUTRUN_L=0x37, + DEMO23_INDEX_BTP_07_PM_CUT3WAITB=0x38, + DEMO23_INDEX_BTP_07_KM_CUT3WAITA=0x39, + DEMO23_INDEX_BTP_07_KM_CUT3WAITB=0x3A, + DEMO23_INDEX_BTP_07_PM_CUT3FURIMUKI=0x3B, + DEMO23_INDEX_BTP_07_PM_CUT3WAITA=0x3C, + DEMO23_INDEX_BTP_07_KM_CUT3FURIMUKI=0x3D, + DEMO23_INDEX_BTP_23_ZL_CUT06_KIZUKU_O=0x3E, + DEMO23_INDEX_BTP_23_ZL_CUT08_OPEN_O=0x3F, + DEMO23_INDEX_BTP_23_ZL_CUT12_HANDUP_O=0x40, + DEMO23_INDEX_BTP_23_ZL_CUT13_HANDPOINT_O=0x41, + DEMO23_INDEX_BTP_23_ZL_CUT14_LOOKG_O=0x42, + DEMO23_INDEX_BTP_23_ZL_CUT14_LOOKGB_O=0x43, + DEMO23_INDEX_BTP_23_ZL_CUT20_FURIKAERI_O=0x44, + DEMO23_INDEX_BTP_23_ZL_CUT20_RUN_O=0x45, + DEMO23_INDEX_BTP_23_P1A_CUT14_HANDUP_O=0x46, + DEMO23_INDEX_BTP_23_P1A_CUT14_RUNNING_O=0x47, + DEMO23_INDEX_BTP_23_P1A_CUT14_TURNRUN_O=0x48, + DEMO23_INDEX_BTP_23_P1A_CUT15_TAKEOUT_O=0x49, + DEMO23_INDEX_BTP_23_LS_CUT04_TURN_O=0x4A, + DEMO23_INDEX_BTP_23_LS_CUT05_RUNNING_O=0x4B, + DEMO23_INDEX_BTP_23_LS_CUT05_TETORLOOK_O=0x4C, + DEMO23_INDEX_BTP_23_LS_CUT10_WARAU_O=0x4D, + DEMO23_INDEX_BTP_23_LS_CUT13_LOOKTORINK_O=0x4E, + DEMO23_INDEX_BTP_23_LS_CUT15_TAKEOUT_O=0x4F, + + /* BCKS */ + DEMO23_INDEX_BCK_23_LS_CUT04_ORIWAIT_L=0x52, + DEMO23_INDEX_BCK_23_LS_CUT04_TURNWAIT_L=0x53, + DEMO23_INDEX_BCK_23_LS_CUT05_RUNWAIT_L=0x54, + DEMO23_INDEX_BCK_23_LS_CUT05_TETORLOOKWAIT_L=0x55, + DEMO23_INDEX_BCK_23_LS_CUT10_CRYWAIT_L=0x56, + DEMO23_INDEX_BCK_23_LS_CUT13_LOOKTETORA_L=0x57, + DEMO23_INDEX_BCK_23_LS_CUT13_LOOKWAIT_L=0x58, + DEMO23_INDEX_BCK_23_LS_CUT16_TAKEOUTRUN_L=0x59, + DEMO23_INDEX_BCK_23_MD_CUT10_TAKEOUT_L=0x5A, + DEMO23_INDEX_BCK_23_P1A_CUT06_WALK_L=0x5B, + DEMO23_INDEX_BCK_23_P1A_CUT07_KEY_L=0x5C, + DEMO23_INDEX_BCK_23_P1A_CUT10_TAKEOUT_L=0x5D, + DEMO23_INDEX_BCK_23_P1A_CUT14_HANDUPWAIT_L=0x5E, + DEMO23_INDEX_BCK_23_P1A_CUT16_TAKEOUTRUN_L=0x5F, + DEMO23_INDEX_BCK_23_P1B_CUT10_TAKEOUT_L=0x60, + DEMO23_INDEX_BCK_23_PM_CUT10_TAKEOUT_L=0x61, + DEMO23_INDEX_BCK_23_ZL_CUT06_MEIREI_L=0x62, + DEMO23_INDEX_BCK_23_ZL_CUT06_WAIT_L=0x63, + DEMO23_INDEX_BCK_23_ZL_CUT08_KIZUKUWAIT_L=0x64, + DEMO23_INDEX_BCK_23_ZL_CUT08_OPENWAIT_L=0x65, + DEMO23_INDEX_BCK_23_ZL_CUT12_HANDUPWAIT_L=0x66, + DEMO23_INDEX_BCK_23_ZL_CUT13_HANDPOINTWAIT_L=0x67, + DEMO23_INDEX_BCK_23_ZL_CUT14_LOOKGBWAIT_L=0x68, + DEMO23_INDEX_BCK_23_ZL_CUT14_LOOKGWAIT_L=0x69, + DEMO23_INDEX_BCK_23_ZL_CUT18_RUN_L=0x6A, + DEMO23_INDEX_BCK_23_ZL_CUT20_FURIKAERIWAIT_L=0x6B, + DEMO23_INDEX_BCK_DK_MAJYUTO_DEMO1=0x6C, + DEMO23_INDEX_BCK_07_KM_CUT3FURIMUKI=0x6D, + DEMO23_INDEX_BCK_07_KM_CUT3WAITA=0x6E, + DEMO23_INDEX_BCK_07_KM_CUT3WAITB=0x6F, + DEMO23_INDEX_BCK_07_PM_CUT3FURIMUKI=0x70, + DEMO23_INDEX_BCK_07_PM_CUT3WAITA=0x71, + DEMO23_INDEX_BCK_07_PM_CUT3WAITB=0x72, + DEMO23_INDEX_BCK_23_LS_CUT04_TURN_O=0x73, + DEMO23_INDEX_BCK_23_LS_CUT05_RUNNING_O=0x74, + DEMO23_INDEX_BCK_23_LS_CUT05_TETORLOOK_O=0x75, + DEMO23_INDEX_BCK_23_LS_CUT10_WARAU_O=0x76, + DEMO23_INDEX_BCK_23_LS_CUT13_LOOKTORINK_O=0x77, + DEMO23_INDEX_BCK_23_LS_CUT15_TAKEOUT_O=0x78, + DEMO23_INDEX_BCK_23_P1A_CUT14_HANDUP_O=0x79, + DEMO23_INDEX_BCK_23_P1A_CUT14_RUNNING_O=0x7A, + DEMO23_INDEX_BCK_23_P1A_CUT14_TURNRUN_O=0x7B, + DEMO23_INDEX_BCK_23_P1A_CUT15_TAKEOUT_O=0x7C, + DEMO23_INDEX_BCK_23_ZL_CUT06_KIZUKU_O=0x7D, + DEMO23_INDEX_BCK_23_ZL_CUT08_OPEN_O=0x7E, + DEMO23_INDEX_BCK_23_ZL_CUT12_HANDUP_O=0x7F, + DEMO23_INDEX_BCK_23_ZL_CUT13_HANDPOINT_O=0x80, + DEMO23_INDEX_BCK_23_ZL_CUT14_LOOKG_O=0x81, + DEMO23_INDEX_BCK_23_ZL_CUT14_LOOKGB_O=0x82, + DEMO23_INDEX_BCK_23_ZL_CUT20_FURIKAERI_O=0x83, + DEMO23_INDEX_BCK_23_ZL_CUT20_RUN_O=0x84, + DEMO23_INDEX_BCK_P1_WAIT=0x85, + DEMO23_INDEX_BCK_P1_WAIT02=0x86, + DEMO23_INDEX_BCK_07B_DK_CUT8_HOBA=0x87, + + /* BDL */ + DEMO23_INDEX_BDL_DK_COMP=0x8A, + DEMO23_INDEX_BDL_SDOOR01=0x8B, + + /* BDLM */ + DEMO23_INDEX_BDL_DM=0x8E, + DEMO23_INDEX_BDL_KM=0x8F, + DEMO23_INDEX_BDL_PM=0x90, +}; +#else enum DEMO23_RES_FILE_INDEX { /* STB */ DEMO23_INDEX_STB_RESCUE=0x8, @@ -286,5 +430,6 @@ enum DEMO23_RES_FILE_INDEX { DEMO23_INDEX_BDL_KM=0x90, DEMO23_INDEX_BDL_PM=0x91, }; +#endif #endif /* RES_DEMO23_H */ diff --git a/include/d/res/res_demo26.h b/include/d/res/res_demo26.h index c58dc4124..4a96e478d 100644 --- a/include/d/res/res_demo26.h +++ b/include/d/res/res_demo26.h @@ -51,7 +51,9 @@ enum DEMO26_RES_FILE_ID { DEMO26_BDL_GDEMO_MINAMO00=0x25, DEMO26_BDL_CY_DOLL_INVISIBLE=0x2E, DEMO26_BDL_CY_INVISIBLE=0x2F, +#if VERSION > VERSION_DEMO DEMO26_BDL_CY_ANTIINDIRECT=0x30, +#endif /* BRK */ DEMO26_BRK_CY_COLOR=0x22, @@ -109,14 +111,24 @@ enum DEMO26_RES_FILE_INDEX { DEMO26_INDEX_BDL_GDEMO_MINAMO00=0x33, DEMO26_INDEX_BDL_CY_DOLL_INVISIBLE=0x34, DEMO26_INDEX_BDL_CY_INVISIBLE=0x35, +#if VERSION > VERSION_DEMO DEMO26_INDEX_BDL_CY_ANTIINDIRECT=0x36, +#endif /* BRK */ +#if VERSION == VERSION_DEMO + DEMO26_INDEX_BRK_CY_COLOR=0x38, + DEMO26_INDEX_BRK_GDEMO_MINAMO00=0x39, + DEMO26_INDEX_BRK_26_CY_CUT00_O=0x3A, + DEMO26_INDEX_BRK_26_CY_CUT15_O=0x3B, + DEMO26_INDEX_BRK_26_DOLL_CUT00_O=0x3C, +#else DEMO26_INDEX_BRK_CY_COLOR=0x39, DEMO26_INDEX_BRK_GDEMO_MINAMO00=0x3A, DEMO26_INDEX_BRK_26_CY_CUT00_O=0x3B, DEMO26_INDEX_BRK_26_CY_CUT15_O=0x3C, DEMO26_INDEX_BRK_26_DOLL_CUT00_O=0x3D, +#endif }; #endif /* RES_DEMO26_H */ diff --git a/include/d/res/res_demo28.h b/include/d/res/res_demo28.h index 19ee7d683..eda9dee22 100644 --- a/include/d/res/res_demo28.h +++ b/include/d/res/res_demo28.h @@ -31,6 +31,11 @@ enum DEMO28_RES_FILE_ID { DEMO28_BDL_GDEMO19_TF00=0x28, DEMO28_BDL_MASTERSW_LV1=0x2A, DEMO28_BDL_AC_WING_COMP=0x2F, +#if VERSION == VERSION_DEMO + DEMO28_BDL_GTFGLOW00=0x5D, + DEMO28_BDL_GDEMO29_A00=0x5E, + DEMO28_BDL_GDEMO29_B00=0x5F, +#endif /* BCKS */ DEMO28_BCK_29_MD_HM_KIZUKU_O=0xD, @@ -108,6 +113,115 @@ enum DEMO28_RES_FILE_ID { DEMO28_BDL_MAT_BLACK_BOX=0x3C, }; +#if VERSION == VERSION_DEMO +enum DEMO28_RES_FILE_INDEX { + /* STB */ + DEMO28_INDEX_STB_AWAKE_ZOLA=0x9, + + /* BRK */ + DEMO28_INDEX_BRK_FADEBOX_BLACK=0xC, + DEMO28_INDEX_BRK_FADE_IN45F=0xD, + DEMO28_INDEX_BRK_FADE_OUT15F=0xE, + DEMO28_INDEX_BRK_FADE_OUT30F=0xF, + DEMO28_INDEX_BRK_FADE_IN15F=0x10, + DEMO28_INDEX_BRK_FADEBOX_INVISIBLE=0x11, + DEMO28_INDEX_BRK_ZS_TEST=0x12, + DEMO28_INDEX_BRK_30_FD_LOOP_L=0x13, + DEMO28_INDEX_BRK_30_FD_TOIKAKE_O=0x14, + DEMO28_INDEX_BRK_27_ZS_WAITA_L=0x15, + DEMO28_INDEX_BRK_27_ZS_WAITAA_O=0x16, + DEMO28_INDEX_BRK_27_ZS_WAITAB_O=0x17, + DEMO28_INDEX_BRK_GDEMO19_TF00=0x18, + + /* BDLM */ + DEMO28_INDEX_BDL_MD_HARP_MOTI=0x1B, + DEMO28_INDEX_BDL_ZS=0x1C, + DEMO28_INDEX_BDL_BLACKFADEBOX=0x1D, + DEMO28_INDEX_BDL_BLACK_PLANE=0x1E, + DEMO28_INDEX_BDL_AC_NOMAL_COMP=0x1F, + DEMO28_INDEX_BDL_GDEMO19_TF00=0x20, + DEMO28_INDEX_BDL_MASTERSW_LV1=0x21, + DEMO28_INDEX_BDL_AC_WING_COMP=0x22, + DEMO28_INDEX_BDL_GTFGLOW00=0x23, + DEMO28_INDEX_BDL_GDEMO29_A00=0x24, + DEMO28_INDEX_BDL_GDEMO29_B00=0x25, + + /* BCKS */ + DEMO28_INDEX_BCK_29_MD_HM_KIZUKU_O=0x28, + DEMO28_INDEX_BCK_29_MD_HM_REI_O=0x29, + DEMO28_INDEX_BCK_ZS_WAIT_L=0x2A, + DEMO28_INDEX_BCK_27_ZS_WAITA_L=0x2B, + DEMO28_INDEX_BCK_27_ZS_WAITB_L=0x2C, + DEMO28_INDEX_BCK_21_SWMS_CUT1_O=0x2D, + DEMO28_INDEX_BCK_D24_AC_CUT32_FLYING_L=0x2E, + DEMO28_INDEX_BCK_29_MD_HM_LOOP_L=0x2F, + DEMO28_INDEX_BCK_28_MD_KAKAEB_O=0x30, + DEMO28_INDEX_BCK_28_MD_KAKAEC_L=0x31, + DEMO28_INDEX_BCK_28_MD_KAKAE_L=0x32, + DEMO28_INDEX_BCK_28_MD_MIAGE_L=0x33, + DEMO28_INDEX_BCK_28_MD_TAORE_O=0x34, + DEMO28_INDEX_BCK_28_AC_CUT22_FLY_L=0x35, + DEMO28_INDEX_BCK_28_AC_CUT26_BONYARI_L=0x36, + DEMO28_INDEX_BCK_28_AC_CUT26_LOOKAROUND_L=0x37, + DEMO28_INDEX_BCK_28_MD_MIAGEB_O=0x38, + DEMO28_INDEX_BCK_28_MD_MIAGEC_L=0x39, + DEMO28_INDEX_BCK_D28_MD_CUT11_LOOKUP_O=0x3A, + DEMO28_INDEX_BCK_D28_MD_CUT11_LOOKUPWAIT_L=0x3B, + DEMO28_INDEX_BCK_D28_MD_CUT4_HEADUP_O=0x3C, + DEMO28_INDEX_BCK_D28_MD_CUT4_WAIT_L=0x3D, + DEMO28_INDEX_BCK_D28_MD_CUT5_HEADUPWAIT_L=0x3E, + DEMO28_INDEX_BCK_D28_MD_CUT6_LOOKRALTO_O=0x3F, + DEMO28_INDEX_BCK_D28_MD_CUT6_LOOKRALTOWAIT_L=0x40, + DEMO28_INDEX_BCK_D28_MD_CUT7_PLAY_L=0x41, + DEMO28_INDEX_BCK_D28_MD_CUT7_PREPLAY_O=0x42, + DEMO28_INDEX_BCK_D28_MD_CUT9_ENDPLAY_O=0x43, + DEMO28_INDEX_BCK_D28_MD_CUT9_WAIT_L=0x44, + DEMO28_INDEX_BCK_D28_ZS_CUT5_PLAY_L=0x45, + DEMO28_INDEX_BCK_D28_ZS_CUT5_PREPLAY_O=0x46, + DEMO28_INDEX_BCK_D28_ZS_CUT6_PLAY_L=0x47, + DEMO28_INDEX_BCK_D28_ZS_CUT9_PLAYEND_O=0x48, + + /* BTP */ + DEMO28_INDEX_BTP_ZS_WAIT_L=0x4B, + DEMO28_INDEX_BTP_29_MD_HM_KIZUKU_O=0x4C, + DEMO28_INDEX_BTP_29_MD_HM_REI_O=0x4D, + DEMO28_INDEX_BTP_27_ZS_WAITA_L=0x4E, + DEMO28_INDEX_BTP_27_ZS_WAITB_L=0x4F, + DEMO28_INDEX_BTP_D24_AC_CUT32_FLYING_L=0x50, + DEMO28_INDEX_BTP_29_MD_HM_LOOP_L=0x51, + DEMO28_INDEX_BTP_28_MD_KAKAE_L=0x52, + DEMO28_INDEX_BTP_28_MD_KAKAEB_O=0x53, + DEMO28_INDEX_BTP_28_MD_KAKAEC_L=0x54, + DEMO28_INDEX_BTP_28_MD_MIAGE_L=0x55, + DEMO28_INDEX_BTP_28_MD_TAORE_O=0x56, + DEMO28_INDEX_BTP_28_AC_CUT26_LOOKAROUND_L=0x57, + DEMO28_INDEX_BTP_28_AC_CUT26_BONYARI_L=0x58, + DEMO28_INDEX_BTP_28_AC_CUT22_FLY_L=0x59, + DEMO28_INDEX_BTP_28_MD_MIAGEB_O=0x5A, + DEMO28_INDEX_BTP_28_MD_MIAGEC_L=0x5B, + DEMO28_INDEX_BTP_D28_MD_CUT11_LOOKUP_O=0x5C, + DEMO28_INDEX_BTP_D28_MD_CUT11_LOOKUPWAIT_L=0x5D, + DEMO28_INDEX_BTP_D28_MD_CUT4_HEADUP_O=0x5E, + DEMO28_INDEX_BTP_D28_MD_CUT4_WAIT_L=0x5F, + DEMO28_INDEX_BTP_D28_MD_CUT5_HEADUPWAIT_L=0x60, + DEMO28_INDEX_BTP_D28_MD_CUT6_LOOKRALTO_O=0x61, + DEMO28_INDEX_BTP_D28_MD_CUT6_LOOKRALTOWAIT_L=0x62, + DEMO28_INDEX_BTP_D28_MD_CUT7_PLAY_L=0x63, + DEMO28_INDEX_BTP_D28_MD_CUT7_PREPLAY_O=0x64, + DEMO28_INDEX_BTP_D28_MD_CUT9_ENDPLAY_O=0x65, + DEMO28_INDEX_BTP_D28_MD_CUT9_WAIT_L=0x66, + DEMO28_INDEX_BTP_D28_ZS_CUT5_PLAY_L=0x67, + DEMO28_INDEX_BTP_D28_ZS_CUT5_PREPLAY_O=0x68, + DEMO28_INDEX_BTP_D28_ZS_CUT6_PLAY_L=0x69, + DEMO28_INDEX_BTP_D28_ZS_CUT9_PLAYEND_O=0x6A, + + /* BTK */ + DEMO28_INDEX_BTK_GDEMO19_TF00=0x6D, + + /* BDL */ + DEMO28_INDEX_BDL_MAT_BLACK_BOX=0x70, +}; +#else enum DEMO28_RES_FILE_INDEX { /* STB */ DEMO28_INDEX_STB_AWAKE_ZOLA=0x9, @@ -212,5 +326,6 @@ enum DEMO28_RES_FILE_INDEX { /* BDL */ DEMO28_INDEX_BDL_MAT_BLACK_BOX=0x6D, }; +#endif #endif /* RES_DEMO28_H */ diff --git a/include/d/res/res_demo32.h b/include/d/res/res_demo32.h index 4475ef1a4..ba01c2943 100644 --- a/include/d/res/res_demo32.h +++ b/include/d/res/res_demo32.h @@ -28,7 +28,9 @@ enum DEMO32_RES_FILE_ID { DEMO32_BCK_31_FD_CUT01_PLAY_L=0x1F, DEMO32_BCK_31_FD_CUT07_OZIGI_O=0x20, DEMO32_BCK_31_FD_CUT07_OZIGIWAIT_L=0x21, +#if VERSION > VERSION_DEMO DEMO32_BCK_MASTERSW_LV1_2=0x31, +#endif /* BTP */ DEMO32_BTP_30_FD_LOOP_L=0x6, @@ -56,7 +58,9 @@ enum DEMO32_RES_FILE_ID { DEMO32_BDL_GDEMO29_A00=0x27, DEMO32_BDL_GDEMO29_B00=0x2B, DEMO32_BDL_GDEMO29_C00=0x30, +#if VERSION > VERSION_DEMO DEMO32_BDL_MASTERSW_LV1_2=0x32, +#endif /* BDL */ DEMO32_BDL_CD_COMP=0xB, @@ -67,7 +71,66 @@ enum DEMO32_RES_FILE_ID { DEMO32_BTK_GDEMO29_B00=0x2C, }; -#if VERSION <= VERSION_JPN +#if VERSION == VERSION_DEMO +enum DEMO32_RES_FILE_INDEX { + /* STB */ + DEMO32_INDEX_STB_PRAY_KOKIRI=0x9, + + /* BCKS */ + DEMO32_INDEX_BCK_15_CB_CUT10_PLAY_L=0xC, + DEMO32_INDEX_BCK_15_CB_CUT10_TAMESHI_O=0xD, + DEMO32_INDEX_BCK_15_CB_CUT21A_PLAYEND_O=0xE, + DEMO32_INDEX_BCK_30_FD_LOOP_L=0xF, + DEMO32_INDEX_BCK_15_CB_CUT21B_FURIAGE_O=0x10, + DEMO32_INDEX_BCK_15_CB_CUT22_WAIT_L=0x11, + DEMO32_INDEX_BCK_15_CB_CUT2_NAKU_L=0x12, + DEMO32_INDEX_BCK_15_CB_CUT2_TYAKUTI_O=0x13, + DEMO32_INDEX_BCK_15_CB_CUT7_HA_O=0x14, + DEMO32_INDEX_BCK_15_CB_CUT7_JUMP_L=0x15, + DEMO32_INDEX_BCK_15_CB_CUT8_BIGJUMP_O=0x16, + DEMO32_INDEX_BCK_15_CB_CUT8_TYAKUTI_O=0x17, + DEMO32_INDEX_BCK_15_CB_CUT9_TURN_O=0x18, + DEMO32_INDEX_BCK_15_CB_CUT9_WAIT_L=0x19, + DEMO32_INDEX_BCK_21_SWMS_CUT1_O=0x1A, + DEMO32_INDEX_BCK_29_SWMS_MSHENKA_O=0x1B, + DEMO32_INDEX_BCK_31_CB_CUT01_PLAY_L=0x1C, + DEMO32_INDEX_BCK_31_FD_CUT01_PLAY_L=0x1D, + DEMO32_INDEX_BCK_31_FD_CUT07_OZIGI_O=0x1E, + DEMO32_INDEX_BCK_31_FD_CUT07_OZIGIWAIT_L=0x1F, + + /* BTP */ + DEMO32_INDEX_BTP_30_FD_LOOP_L=0x22, + DEMO32_INDEX_BTP_31_FD_CUT01_PLAY_L=0x23, + DEMO32_INDEX_BTP_31_FD_CUT07_OZIGI_O=0x24, + DEMO32_INDEX_BTP_31_FD_CUT07_OZIGIWAIT_L=0x25, + + /* BRK */ + DEMO32_INDEX_BRK_30_FD_TOIKAKEB2_L=0x28, + DEMO32_INDEX_BRK_30_FD_TOIKAKE2_O=0x29, + DEMO32_INDEX_BRK_30_FD_LOOP_L=0x2A, + DEMO32_INDEX_BRK_GDEMO19_TF00=0x2B, + DEMO32_INDEX_BRK_GDEMO29_A00=0x2C, + DEMO32_INDEX_BRK_GDEMO29_A01=0x2D, + DEMO32_INDEX_BRK_GDEMO29_C00=0x2E, + DEMO32_INDEX_BRK_GDEMO29_C01=0x2F, + + /* BDLM */ + DEMO32_INDEX_BDL_FD_COMP=0x32, + DEMO32_INDEX_BDL_GDEMO19_TF00=0x33, + DEMO32_INDEX_BDL_MASTERSW_LV2=0x34, + DEMO32_INDEX_BDL_GDEMO29_A00=0x35, + DEMO32_INDEX_BDL_GDEMO29_B00=0x36, + DEMO32_INDEX_BDL_GDEMO29_C00=0x37, + + /* BDL */ + DEMO32_INDEX_BDL_CD_COMP=0x3A, + + /* BTK */ + DEMO32_INDEX_BTK_GDEMO19_TF00=0x3D, + DEMO32_INDEX_BTK_SWMS_NO_FLASH=0x3E, + DEMO32_INDEX_BTK_GDEMO29_B00=0x3F, +}; +#elif VERSION == VERSION_JPN enum DEMO32_RES_FILE_INDEX { /* STB */ DEMO32_INDEX_STB_PRAY_KOKIRI=0x9, diff --git a/include/d/res/res_demo42.h b/include/d/res/res_demo42.h index 9ee23f301..0d459aed0 100644 --- a/include/d/res/res_demo42.h +++ b/include/d/res/res_demo42.h @@ -245,8 +245,10 @@ enum DEMO42_RES_FILE_ID { DEMO42_BRK_42_SWMS2_CUT46B_L=0xBA, DEMO42_BRK_42_SWMS2_CUT46_O=0xBB, DEMO42_BRK_42_SWMS2_CUT48_O=0xBC, +#if VERSION > VERSION_DEMO DEMO42_BRK_ZELDA_MARK_ON=0xFB, DEMO42_BRK_ZELDA_MARK_OFF=0xFC, +#endif /* BDLM */ DEMO42_BDL_HI_COMP=0x12, @@ -505,10 +507,23 @@ enum DEMO42_RES_FILE_INDEX { DEMO42_INDEX_BRK_42_SWMS2_CUT46B_L=0xF5, DEMO42_INDEX_BRK_42_SWMS2_CUT46_O=0xF6, DEMO42_INDEX_BRK_42_SWMS2_CUT48_O=0xF7, +#if VERSION > VERSION_DEMO DEMO42_INDEX_BRK_ZELDA_MARK_ON=0xF8, DEMO42_INDEX_BRK_ZELDA_MARK_OFF=0xF9, +#endif /* BDLM */ +#if VERSION == VERSION_DEMO + DEMO42_INDEX_BDL_HI_COMP=0xFA, + DEMO42_INDEX_BDL_25_TRI_PLUS=0xFB, + DEMO42_INDEX_BDL_CL_MON=0xFC, + DEMO42_INDEX_BDL_MASTERSW_LV2=0xFD, + DEMO42_INDEX_BDL_TRI_ONLY=0xFE, + DEMO42_INDEX_BDL_GNN_BTL_TAKI=0xFF, + DEMO42_INDEX_BDL_GNN_DEMO_TAKI_S=0x100, + DEMO42_INDEX_BDL_V_42_TRI=0x101, + DEMO42_INDEX_BDL_V42_TRI_ONE=0x102, +#else DEMO42_INDEX_BDL_HI_COMP=0xFC, DEMO42_INDEX_BDL_25_TRI_PLUS=0xFD, DEMO42_INDEX_BDL_CL_MON=0xFE, @@ -518,9 +533,14 @@ enum DEMO42_RES_FILE_INDEX { DEMO42_INDEX_BDL_GNN_DEMO_TAKI_S=0x102, DEMO42_INDEX_BDL_V_42_TRI=0x103, DEMO42_INDEX_BDL_V42_TRI_ONE=0x104, +#endif /* STB */ +#if VERSION == VERSION_DEMO + DEMO42_INDEX_STB_G2BEFORE=0x105, +#else DEMO42_INDEX_STB_G2BEFORE=0x107, +#endif }; #endif /* RES_DEMO42_H */ diff --git a/include/d/res/res_figure2.h b/include/d/res/res_figure2.h index 5a3d18bb0..3da6c9c6d 100644 --- a/include/d/res/res_figure2.h +++ b/include/d/res/res_figure2.h @@ -32,7 +32,9 @@ enum FIGURE2_RES_FILE_ID { FIGURE2_BDL_VF_064S=0x16, FIGURE2_BDL_VF_053=0x17, FIGURE2_BDL_VF_056=0x18, +#if VERSION > VERSION_DEMO FIGURE2_BDL_VF_064=0x1B, +#endif /* BDLM */ FIGURE2_BDL_VF_061=0x19, @@ -70,13 +72,23 @@ enum FIGURE2_RES_FILE_INDEX { FIGURE2_INDEX_BDL_VF_064S=0x1E, FIGURE2_INDEX_BDL_VF_053=0x1F, FIGURE2_INDEX_BDL_VF_056=0x20, +#if VERSION > VERSION_DEMO FIGURE2_INDEX_BDL_VF_064=0x21, +#endif /* BDLM */ +#if VERSION == VERSION_DEMO + FIGURE2_INDEX_BDL_VF_061=0x23, +#else FIGURE2_INDEX_BDL_VF_061=0x24, +#endif /* BRK */ +#if VERSION == VERSION_DEMO + FIGURE2_INDEX_BRK_VF_061=0x26, +#else FIGURE2_INDEX_BRK_VF_061=0x27, +#endif }; #endif /* RES_FIGURE2_H */ diff --git a/include/d/res/res_figure2a.h b/include/d/res/res_figure2a.h index 9ec6f4abe..ff8ae72b6 100644 --- a/include/d/res/res_figure2a.h +++ b/include/d/res/res_figure2a.h @@ -3,6 +3,7 @@ #include "global.h" +#if VERSION > VERSION_DEMO enum FIGURE2A_RES_FILE_ID { /* BDL */ FIGURE2A_BDL_VF_041=0x0, @@ -50,5 +51,6 @@ enum FIGURE2A_RES_FILE_INDEX { FIGURE2A_INDEX_BDL_VF_059=0x15, FIGURE2A_INDEX_BDL_VF_060=0x16, }; +#endif #endif /* RES_FIGURE2A_H */ diff --git a/include/d/res/res_figure2b.h b/include/d/res/res_figure2b.h index fc76efb75..60952607d 100644 --- a/include/d/res/res_figure2b.h +++ b/include/d/res/res_figure2b.h @@ -3,6 +3,7 @@ #include "global.h" +#if VERSION > VERSION_DEMO enum FIGURE2B_RES_FILE_ID { /* BCK */ FIGURE2B_BCK_VF_064L=0x0, @@ -38,5 +39,6 @@ enum FIGURE2B_RES_FILE_INDEX { /* BRK */ FIGURE2B_INDEX_BRK_VF_061=0x13, }; +#endif #endif /* RES_FIGURE2B_H */ diff --git a/include/d/res/res_figure6a.h b/include/d/res/res_figure6a.h index 0157d5d50..0931f9ecc 100644 --- a/include/d/res/res_figure6a.h +++ b/include/d/res/res_figure6a.h @@ -3,6 +3,7 @@ #include "global.h" +#if VERSION > VERSION_DEMO enum FIGURE6A_RES_FILE_ID { /* BDL */ FIGURE6A_BDL_VF_116=0x0, @@ -26,5 +27,6 @@ enum FIGURE6A_RES_FILE_INDEX { FIGURE6A_INDEX_BDL_VF_122=0x9, FIGURE6A_INDEX_BDL_VF_123=0xA, }; +#endif #endif /* RES_FIGURE6A_H */ diff --git a/include/d/res/res_figure6b.h b/include/d/res/res_figure6b.h index 4a5705f1c..58d8951da 100644 --- a/include/d/res/res_figure6b.h +++ b/include/d/res/res_figure6b.h @@ -3,6 +3,7 @@ #include "global.h" +#if VERSION > VERSION_DEMO enum FIGURE6B_RES_FILE_ID { /* BDL */ FIGURE6B_BDL_VF_124=0x0, @@ -20,5 +21,6 @@ enum FIGURE6B_RES_FILE_INDEX { FIGURE6B_INDEX_BDL_VF_127=0x6, FIGURE6B_INDEX_BDL_VF_128=0x7, }; +#endif #endif /* RES_FIGURE6B_H */ diff --git a/include/d/res/res_figure6c.h b/include/d/res/res_figure6c.h index b8e00fcaf..2eb1d37ae 100644 --- a/include/d/res/res_figure6c.h +++ b/include/d/res/res_figure6c.h @@ -3,6 +3,7 @@ #include "global.h" +#if VERSION > VERSION_DEMO enum FIGURE6C_RES_FILE_ID { /* BDL */ FIGURE6C_BDL_VF_129=0x0, @@ -20,5 +21,6 @@ enum FIGURE6C_RES_FILE_INDEX { FIGURE6C_INDEX_BDL_VF_132=0x6, FIGURE6C_INDEX_BDL_VF_133=0x7, }; +#endif #endif /* RES_FIGURE6C_H */ diff --git a/include/d/res/res_gover.h b/include/d/res/res_gover.h index 86ccc9b96..167a85357 100644 --- a/include/d/res/res_gover.h +++ b/include/d/res/res_gover.h @@ -3,7 +3,25 @@ #include "global.h" -#if VERSION == VERSION_PAL +#if VERSION == VERSION_DEMO +enum GOVER_RES_FILE_ID { // IDs and indexes are synced + /* ROOT */ + GOVER_ARC_GOVER=0x0, + + /* SCRN */ + GOVER_BLO_GAMEOVER=0x5, + + /* TIMG */ + GOVER_BTI_SHIPFONT_A_BIG=0x8, + GOVER_BTI_SHIPFONT_E_BIG=0x9, + GOVER_BTI_SHIPFONT_G_BIG=0xA, + GOVER_BTI_SHIPFONT_M_BIG=0xB, + GOVER_BTI_SHIPFONT_O_BIG=0xC, + GOVER_BTI_SHIPFONT_R_BIG=0xD, + GOVER_BTI_SHIPFONT_V_BIG=0xE, + GOVER_BTI_SMOKE=0xF, +}; +#elif VERSION == VERSION_PAL enum GOVER_RES_FILE_ID { // IDs and indexes are synced /* SCRN */ GOVER_BLO_GAMEOVER=0x4, diff --git a/include/d/res/res_hseki.h b/include/d/res/res_hseki.h index dc85b34f2..21db00846 100644 --- a/include/d/res/res_hseki.h +++ b/include/d/res/res_hseki.h @@ -3,6 +3,25 @@ #include "global.h" +#if VERSION == VERSION_DEMO +enum HSEKI_RES_FILE_ID { // IDs and indexes are synced + /* BDL */ + HSEKI_BDL_HSEKI3=0x5, + HSEKI_BDL_HSEKI32=0x6, + HSEKI_BDL_HSEKI4=0x7, + HSEKI_BDL_HSEKI42=0x8, + HSEKI_BDL_HSEKI5=0x9, + HSEKI_BDL_HSEKI52=0xA, + + /* BDLM */ + HSEKI_BDL_HMON1=0xD, + HSEKI_BDL_HMON2=0xE, + + /* BRK */ + HSEKI_BRK_HMON1=0x11, + HSEKI_BRK_HMON2=0x12, +}; +#else enum HSEKI_RES_FILE_ID { // IDs and indexes are synced /* BDLM */ HSEKI_BDL_HMON1=0x4, @@ -12,5 +31,6 @@ enum HSEKI_RES_FILE_ID { // IDs and indexes are synced HSEKI_BRK_HMON1=0x8, HSEKI_BRK_HMON2=0x9, }; +#endif #endif /* RES_HSEKI_H */ diff --git a/include/d/res/res_hten1.h b/include/d/res/res_hten1.h index ae336a03e..f2ad5b9ff 100644 --- a/include/d/res/res_hten1.h +++ b/include/d/res/res_hten1.h @@ -3,6 +3,23 @@ #include "global.h" +#if VERSION == VERSION_DEMO +enum HTEN1_RES_FILE_ID { + /* DZB */ + HTEN1_DZB_HTEN1=0x1, + + /* BDL */ + HTEN1_BDL_HTEN1=0x2, +}; + +enum HTEN1_RES_FILE_INDEX { + /* DZB */ + HTEN1_INDEX_DZB_HTEN1=0x4, + + /* BDL */ + HTEN1_INDEX_BDL_HTEN1=0x7, +}; +#else enum HTEN1_RES_FILE_ID { // IDs and indexes are synced /* BDL */ HTEN1_BDL_HTEN1=0x4, @@ -10,5 +27,6 @@ enum HTEN1_RES_FILE_ID { // IDs and indexes are synced /* DZB */ HTEN1_DZB_HTEN1=0x7, }; +#endif #endif /* RES_HTEN1_H */ diff --git a/include/d/res/res_ikadah.h b/include/d/res/res_ikadah.h index 001b3d574..5f9cbbdde 100644 --- a/include/d/res/res_ikadah.h +++ b/include/d/res/res_ikadah.h @@ -4,7 +4,11 @@ #include "global.h" enum IKADAH_RES_FILE_ID { // IDs and indexes are synced +#if VERSION == VERSION_DEMO + /* BCKS */ +#else /* BCK */ +#endif IKADAH_BCK_SVSHIP_KAITEN=0x5, /* BDL */ diff --git a/include/d/res/res_ikari.h b/include/d/res/res_ikari.h index eb3f8bc47..b15d79293 100644 --- a/include/d/res/res_ikari.h +++ b/include/d/res/res_ikari.h @@ -3,11 +3,20 @@ #include "global.h" +#if VERSION == VERSION_DEMO +enum IKARI_RES_FILE_ID { // IDs and indexes are synced + /* BMD */ + IKARI_BMD_S_IKARI2=0x3, + IKARI_BMD_S_IKARI3=0x4, + IKARI_BMD_S_IKARI4=0x5, +}; +#else enum IKARI_RES_FILE_ID { // IDs and indexes are synced /* BDL */ IKARI_BDL_S_IKARI2=0x3, IKARI_BDL_S_IKARI3=0x4, IKARI_BDL_S_IKARI4=0x5, }; +#endif #endif /* RES_IKARI_H */ diff --git a/include/d/res/res_kmi00x.h b/include/d/res/res_kmi00x.h index 358616a34..37811ee5d 100644 --- a/include/d/res/res_kmi00x.h +++ b/include/d/res/res_kmi00x.h @@ -3,6 +3,7 @@ #include "global.h" +#if VERSION > VERSION_DEMO enum KMI00X_RES_FILE_ID { // IDs and indexes are synced /* BDLM */ KMI00X_BDL_KMI_00X=0x4, @@ -10,5 +11,6 @@ enum KMI00X_RES_FILE_ID { // IDs and indexes are synced /* BRK */ KMI00X_BRK_KMI_00X=0x7, }; +#endif #endif /* RES_KMI00X_H */ diff --git a/include/d/res/res_lkd01.h b/include/d/res/res_lkd01.h index 19a3eb621..a154b0877 100644 --- a/include/d/res/res_lkd01.h +++ b/include/d/res/res_lkd01.h @@ -155,7 +155,9 @@ enum LKD01_RES_FILE_ID { LKD01_BCK_WARPOUT=0x19E, LKD01_BCK_WARPOUTFIRST=0x19F, LKD01_BCK_35_CL_CUT5_HAKKENWAIT_O=0x1A2, +#if VERSION > VERSION_DEMO LKD01_BCK_21_CL_CUT12A_O=0x1A9, +#endif #if VERSION > VERSION_JPN LKD01_BCK_TAKTCHISIN_B=0x1AC, LKD01_BCK_TAKTFUJIN_B=0x1AD, @@ -288,7 +290,9 @@ enum LKD01_RES_FILE_ID { LKD01_BTK_35_CL_CUT5_HAKKENWAIT_O=0x1A5, LKD01_BTK_35_CL_CUT5_HAKKEN_O=0x1A6, LKD01_BTK_35_CL_CUT18_MAWARIKUMI_L=0x1A7, +#if VERSION > VERSION_DEMO LKD01_BTK_21_CL_CUT12A_O=0x1AA, +#endif #if VERSION > VERSION_JPN LKD01_BTK_TPRESENTATIONB=0x1B1, #endif @@ -443,10 +447,444 @@ enum LKD01_RES_FILE_ID { LKD01_BTP_TWARPOUT=0x1A0, LKD01_BTP_TWARPOUTFIRST=0x1A1, LKD01_BTP_35_CL_CUT5_HAKKENWAIT_O=0x1A8, +#if VERSION > VERSION_DEMO LKD01_BTP_21_CL_CUT12A_O=0x1AB, +#endif }; -#if VERSION <= VERSION_JPN +#if VERSION == VERSION_DEMO +enum LKD01_RES_FILE_INDEX { + /* BCKS */ + LKD01_INDEX_BCK_24_CL_CUT01_RUNSTOP_O=0x5, + LKD01_INDEX_BCK_24_CL_CUT01_STOPWAIT_L=0x6, + LKD01_INDEX_BCK_24_CL_CUT03_STEPBACK_O=0x7, + LKD01_INDEX_BCK_24_CL_CUT03_STEPBACKWAIT_L=0x8, + LKD01_INDEX_BCK_24_CL_CUT05_LOOKMASTER_O=0x9, + LKD01_INDEX_BCK_24_CL_CUT05_LOOKMSWAIT_L=0xA, + LKD01_INDEX_BCK_24_CL_CUT07_DASH_O=0xB, + LKD01_INDEX_BCK_24_CL_CUT09_HATWAIT_O=0xC, + LKD01_INDEX_BCK_24_CL_CUT09_POSEWAIT_L=0xD, + LKD01_INDEX_BCK_24_CL_CUT10_FACEUP_L=0xE, + LKD01_INDEX_BCK_24_CL_CUT12_LINKFLY_O=0xF, + LKD01_INDEX_BCK_24_CL_CUT13_KNOCKDOWN_O=0x10, + LKD01_INDEX_BCK_24_CL_CUT14_KNOCKDOWNWAIT_L=0x11, + LKD01_INDEX_BCK_24_CL_CUT15_FACEUP_O=0x12, + LKD01_INDEX_BCK_24_CL_CUT16_FAVEUPWAIT_L=0x13, + LKD01_INDEX_BCK_24_CL_CUT20_LOOKUP_L=0x14, + LKD01_INDEX_BCK_24_CL_CUT26_STANDUP_L=0x15, + LKD01_INDEX_BCK_24_CL_CUT26_STANDUPWAIT_L=0x16, + LKD01_INDEX_BCK_24_CL_CUT27_FLY_L=0x17, + LKD01_INDEX_BCK_24_CL_CUT32_FLYMOVE_L=0x18, + LKD01_INDEX_BCK_25_CL_CUT01_LOOKWAIT_L=0x19, + LKD01_INDEX_BCK_25_CL_CUT08_SURPRISE_O=0x1A, + LKD01_INDEX_BCK_25_CL_CUT08_SURPRISEWAIT_L=0x1B, + LKD01_INDEX_BCK_25_CL_CUT14_HEARWAIT_L=0x1C, + LKD01_INDEX_BCK_25_CL_CUT16_LOOKT_O=0x1D, + LKD01_INDEX_BCK_25_CL_CUT16_LOOKTWAIT_L=0x1E, + LKD01_INDEX_BCK_25_CL_CUT22_MABUSII_L=0x1F, + LKD01_INDEX_BCK_25_CL_CUT22_SURPRISE_O=0x20, + LKD01_INDEX_BCK_25_CL_CUT28_WAIT_L=0x21, + LKD01_INDEX_BCK_25_CL_CUT29_NOD_L=0x22, + LKD01_INDEX_BCK_25_CL_CUT31_SURPRISE_O=0x23, + LKD01_INDEX_BCK_25_CL_CUT31_SURPRISEWAIT_L=0x24, + LKD01_INDEX_BCK_25_CL_CUT32_STOP_O=0x25, + LKD01_INDEX_BCK_25_CL_CUT33_STOPWAIT_L=0x26, + LKD01_INDEX_BCK_25_CL_CUT33_TURN_O=0x27, + LKD01_INDEX_BCK_25_CL_CUT33_TURNWAIT_L=0x28, + LKD01_INDEX_BCK_25_CL_CUT35_ADMIREWAIT_L=0x29, + LKD01_INDEX_BCK_25_CL_CUT35_STOPTURN_O=0x2A, + LKD01_INDEX_BCK_25_CL_CUT35_STOPTURNWAIT_L=0x2B, + LKD01_INDEX_BCK_25_CL_CUT36_TURN_O=0x2C, + LKD01_INDEX_BCK_25_CL_CUT36_TURNWAIT_L=0x2D, + LKD01_INDEX_BCK_25_CL_CUT37_TURNRUN_O=0x2E, + LKD01_INDEX_BCK_28_CL_AISATU_O=0x2F, + LKD01_INDEX_BCK_29_CL_MSHENKA_O=0x30, + LKD01_INDEX_BCK_29_CL_MITE_SYOUMENN_O=0x31, + LKD01_INDEX_BCK_29_CL_MITE_UNAZUKU_O=0x32, + LKD01_INDEX_BCK_30_CL_UNAZUKI_O=0x33, + LKD01_INDEX_BCK_33_CL_TE_MIRU_L=0x34, + LKD01_INDEX_BCK_33_CL_TE_MOYOU_O=0x35, + LKD01_INDEX_BCK_33_CL_TEAGE_L=0x36, + LKD01_INDEX_BCK_18_CL_CUT17_FWAIT_L=0x37, + LKD01_INDEX_BCK_45_CL_CUT01_WAIT_L=0x38, + LKD01_INDEX_BCK_45_CL_CUT07_LOOKWAIT_L=0x39, + LKD01_INDEX_BCK_45_CL_CUT11_LOOKSHIP_O=0x3A, + LKD01_INDEX_BCK_45_CL_CUT11_LOOKSHIPWAIT_L=0x3B, + LKD01_INDEX_BCK_45_CL_CUT11_STANDWAIT_L=0x3C, + LKD01_INDEX_BCK_45_CL_CUT12_SINSUI_L=0x3D, + LKD01_INDEX_BCK_MCLINK209=0x3E, + LKD01_INDEX_BCK_47_CL_NOTICEWAIT_L=0x3F, + LKD01_INDEX_BCK_21_CL_CUT12B_O=0x40, + LKD01_INDEX_BCK_37_CL_CUT12_FAINTAWAY_L=0x41, + LKD01_INDEX_BCK_37_CL_CUT17_WAKEUP_O=0x42, + LKD01_INDEX_BCK_37_CL_CUT17_WAKEUPWAIT_L=0x43, + LKD01_INDEX_BCK_37_CL_CUT18_GETUP_O=0x44, + LKD01_INDEX_BCK_37_CL_CUT18_GETUPWAIT_L=0x45, + LKD01_INDEX_BCK_37_CL_CUT20_180TURN_O=0x46, + LKD01_INDEX_BCK_37_CL_CUT20_180TURNWAIT_L=0x47, + LKD01_INDEX_BCK_37_CL_CUT24_HANDUP_O=0x48, + LKD01_INDEX_BCK_37_CL_CUT24_HANDUPWAIT_L=0x49, + LKD01_INDEX_BCK_37_CL_CUT24_SMILING_L=0x4A, + LKD01_INDEX_BCK_28_CL_KAKAE_L=0x4B, + LKD01_INDEX_BCK_28_CL_MIAGE_L=0x4C, + LKD01_INDEX_BCK_26_CL_CUT01_STANDINGWAIT_L=0x4D, + LKD01_INDEX_BCK_26_CL_CUT02_SURPRISE_O=0x4E, + LKD01_INDEX_BCK_26_CL_CUT02_SURPRISEWAIT_L=0x4F, + LKD01_INDEX_BCK_26_CL_CUT03_FACEAWAY_O=0x50, + LKD01_INDEX_BCK_26_CL_CUT03_FACEAWAYWAIT_L=0x51, + LKD01_INDEX_BCK_26_CL_CUT05_BLANKLYWAIT_L=0x52, + LKD01_INDEX_BCK_26_CL_CUT08_LOOKFORROW_L=0x53, + LKD01_INDEX_BCK_26_CL_CUT08_LOOKFORROWWAIT_L=0x54, + LKD01_INDEX_BCK_26_CL_CUT08_SHOCK2ND_O=0x55, + LKD01_INDEX_BCK_26_CL_CUT08_SHOCK_O=0x56, + LKD01_INDEX_BCK_26_CL_CUT08_SHOCKWAIT_L=0x57, + LKD01_INDEX_BCK_26_CL_CUT11_LOOKUPWAIT_L=0x58, + LKD01_INDEX_BCK_26_CL_CUT13_SURPRISE_O=0x59, + LKD01_INDEX_BCK_26_CL_CUT13_SURPRISEWAIT_L=0x5A, + LKD01_INDEX_BCK_26_CL_CUT13_TURNAWAY_O=0x5B, + LKD01_INDEX_BCK_26_CL_CUT13_TURNAWAYWAIT_L=0x5C, + LKD01_INDEX_BCK_46_CL_CUT01_WAITB_L=0x5D, + LKD01_INDEX_BCK_46_CL_CUT01_WAIT_L=0x5E, + LKD01_INDEX_BCK_46_CL_CUT06_LOOKUP_O=0x5F, + LKD01_INDEX_BCK_46_CL_CUT06_LOOKUPWAIT_L=0x60, + LKD01_INDEX_BCK_46_CL_CUT10_LOOKBACK_O=0x61, + LKD01_INDEX_BCK_46_CL_CUT10_LOOKBACKWAIT_L=0x62, + LKD01_INDEX_BCK_46_CL_CUT12_LOOKUPB_O=0x63, + LKD01_INDEX_BCK_46_CL_CUT12_LOOKUPBWAIT_L=0x64, + LKD01_INDEX_BCK_46_CL_CUT16_WAIT_L=0x65, + LKD01_INDEX_BCK_46_CL_CUT25_WAIT_L=0x66, + LKD01_INDEX_BCK_31_CL_CUT06_PLAYEND_L=0x67, + LKD01_INDEX_BCK_ITEMGET=0x68, + LKD01_INDEX_BCK_18_CL_CUT15_ITEMGET_O=0x69, + LKD01_INDEX_BCK_D43_CL_CUT10_WAIT_L=0x6A, + LKD01_INDEX_BCK_D43_CL_CUT19_FUNBARI_L=0x6B, + LKD01_INDEX_BCK_D43_CL_CUT19_KIZUKU_O=0x6C, + LKD01_INDEX_BCK_D43_CL_CUT19_MIAGEWAIT_L=0x6D, + LKD01_INDEX_BCK_D43_CL_CUT19_SLOWFUNBARI_L=0x6E, + LKD01_INDEX_BCK_D43_CL_CUT19_UKABU_O=0x6F, + LKD01_INDEX_BCK_D43_CL_CUT21_NOBASU_O=0x70, + LKD01_INDEX_BCK_D43_CL_CUT21_WAIT_L=0x71, + LKD01_INDEX_BCK_D43_CL_CUT24_WAIT_L=0x72, + LKD01_INDEX_BCK_D43_CL_CUT2_WAIT_O=0x73, + LKD01_INDEX_BCK_D43_CL_CUT4_JUMP_O=0x74, + LKD01_INDEX_BCK_D43_CL_CUT4_WAIT_L=0x75, + LKD01_INDEX_BCK_D43_CL_CUT5_MIAGERU_O=0x76, + LKD01_INDEX_BCK_D43_CL_CUT5_TAORERU_O=0x77, + LKD01_INDEX_BCK_D43_CL_CUT5_WAIT_L=0x78, + LKD01_INDEX_BCK_D43_CL_CUT6_WAIT_L=0x79, + LKD01_INDEX_BCK_42_CL_CUT13_O=0x7A, + LKD01_INDEX_BCK_42_CL_CUT15_O=0x7B, + LKD01_INDEX_BCK_42_CL_CUT16_L=0x7C, + LKD01_INDEX_BCK_42_CL_CUT17_O=0x7D, + LKD01_INDEX_BCK_42_CL_CUT19_L=0x7E, + LKD01_INDEX_BCK_42_CL_CUT1_L=0x7F, + LKD01_INDEX_BCK_42_CL_CUT20_L=0x80, + LKD01_INDEX_BCK_42_CL_CUT25_L=0x81, + LKD01_INDEX_BCK_42_CL_CUT28_O=0x82, + LKD01_INDEX_BCK_42_CL_CUT29_L=0x83, + LKD01_INDEX_BCK_42_CL_CUT44A_O=0x84, + LKD01_INDEX_BCK_42_CL_CUT44B_O=0x85, + LKD01_INDEX_BCK_42_CL_CUT44C_O=0x86, + LKD01_INDEX_BCK_42_CL_CUT45B_O=0x87, + LKD01_INDEX_BCK_42_CL_CUT45C_L=0x88, + LKD01_INDEX_BCK_42_CL_CUT45_L=0x89, + LKD01_INDEX_BCK_42_CL_CUT46_L=0x8A, + LKD01_INDEX_BCK_42_CL_CUT48_O=0x8B, + LKD01_INDEX_BCK_42_CL_CUT10_O=0x8C, + LKD01_INDEX_BCK_10_CL_CUT11_LOOKSKY_O=0x8D, + LKD01_INDEX_BCK_35_CL_CUT18_MAWARIKUMI_L=0x8E, + LKD01_INDEX_BCK_35_CL_CUT1_WALK_L=0x8F, + LKD01_INDEX_BCK_35_CL_CUT5_HAKKEN_O=0x90, + LKD01_INDEX_BCK_35_CL_CUT8_KAMAETEBIKU_O=0x91, + LKD01_INDEX_BCK_35_CL_CUT8_WAIT_L=0x92, + LKD01_INDEX_BCK_36_CL_CUT1_HAAHAA_WAIT_L=0x93, + LKD01_INDEX_BCK_36_CL_CUT1_HURIKAERI_O=0x94, + LKD01_INDEX_BCK_36_CL_CUT1_WAIT_L=0x95, + LKD01_INDEX_BCK_TAKTCHISIN=0x96, + LKD01_INDEX_BCK_TAKTFUJIN=0x97, + LKD01_INDEX_BCK_WARPOUT=0x98, + LKD01_INDEX_BCK_WARPOUTFIRST=0x99, + LKD01_INDEX_BCK_35_CL_CUT5_HAKKENWAIT_O=0x9A, + + /* BTK */ + LKD01_INDEX_BTK_24_CL_CUT03_STEPBACK_O_DVW=0x9D, + LKD01_INDEX_BTK_33_CL_TE_MOYOU_O=0x9E, + LKD01_INDEX_BTK_33_CL_TE_MIRU_L=0x9F, + LKD01_INDEX_BTK_30_CL_UNAZUKI_O=0xA0, + LKD01_INDEX_BTK_29_CL_MSPOWER_UP_O=0xA1, + LKD01_INDEX_BTK_29_CL_MITE_UNAZUKU_O=0xA2, + LKD01_INDEX_BTK_29_CL_MITE_SYOUMENN_O=0xA3, + LKD01_INDEX_BTK_28_CL_AISATU_O=0xA4, + LKD01_INDEX_BTK_25_CL_CUT37_TURNRUN_O=0xA5, + LKD01_INDEX_BTK_25_CL_CUT36_TURNWAIT_L=0xA6, + LKD01_INDEX_BTK_25_CL_CUT36_TURN_O=0xA7, + LKD01_INDEX_BTK_25_CL_CUT35_STOPTURN_O=0xA8, + LKD01_INDEX_BTK_25_CL_CUT35_STOPTRUNWAIT_L=0xA9, + LKD01_INDEX_BTK_25_CL_CUT35_ADMIREWAIT_L=0xAA, + LKD01_INDEX_BTK_25_CL_CUT33_TURNWAIT_L=0xAB, + LKD01_INDEX_BTK_25_CL_CUT33_TURN_O=0xAC, + LKD01_INDEX_BTK_25_CL_CUT33_STOPWAIT_L=0xAD, + LKD01_INDEX_BTK_25_CL_CUT32_STOP_O=0xAE, + LKD01_INDEX_BTK_25_CL_CUT31_SURPRISEWAIT_L=0xAF, + LKD01_INDEX_BTK_25_CL_CUT31_SURPRISE_O=0xB0, + LKD01_INDEX_BTK_25_CL_CUT29_NOD_L=0xB1, + LKD01_INDEX_BTK_25_CL_CUT28_WAIT_L=0xB2, + LKD01_INDEX_BTK_25_CL_CUT22_SURPRISE_O=0xB3, + LKD01_INDEX_BTK_25_CL_CUT22_MABUSII_L=0xB4, + LKD01_INDEX_BTK_25_CL_CUT16_LOOKTWAIT_L=0xB5, + LKD01_INDEX_BTK_25_CL_CUT16_LOOKT_O=0xB6, + LKD01_INDEX_BTK_25_CL_CUT14_HEARWAIT_L=0xB7, + LKD01_INDEX_BTK_25_CL_CUT08_SURPRISEWAIT_L=0xB8, + LKD01_INDEX_BTK_25_CL_CUT08_SURPRISE_O=0xB9, + LKD01_INDEX_BTK_25_CL_CUT01_LOOKWAIT_L=0xBA, + LKD01_INDEX_BTK_24_CL_CUT20_LOOKZL_L=0xBB, + LKD01_INDEX_BTK_24_CL_CUT16_FACEUPWAIT_L=0xBC, + LKD01_INDEX_BTK_24_CL_CUT15_FACEUP_O=0xBD, + LKD01_INDEX_BTK_24_CL_CUT10_FACEUP_O=0xBE, + LKD01_INDEX_BTK_24_CL_CUT07_DASH_O=0xBF, + LKD01_INDEX_BTK_24_CL_CUT05_LOOKMSWAIT_L=0xC0, + LKD01_INDEX_BTK_24_CL_CUT05_LOOKMS_O=0xC1, + LKD01_INDEX_BTK_24_CL_CUT03_SWORDSETWAIT_L=0xC2, + LKD01_INDEX_BTK_33_CL_TEAGE_L=0xC3, + LKD01_INDEX_BTK_TECN=0xC4, + LKD01_INDEX_BTK_18_CL_CUT17_FWAIT=0xC5, + LKD01_INDEX_BTK_45_CL_CUT11_LOOKSHIP_O=0xC6, + LKD01_INDEX_BTK_45_CL_CUT07_LOOKWAIT_L=0xC7, + LKD01_INDEX_BTK_45_CL_CUT01_WAIT_L=0xC8, + LKD01_INDEX_BTK_45_CL_CUT11_LOOKWAIT_L=0xC9, + LKD01_INDEX_BTK_45_CL_CUT11_STANDWAIT_L=0xCA, + LKD01_INDEX_BTK_45_CL_CUT12_SINSUI_L=0xCB, + LKD01_INDEX_BTK_TMCLINK203=0xCC, + LKD01_INDEX_BTK_47_CL_NOTICEWAIT_L=0xCD, + LKD01_INDEX_BTK_21_CL_CUT12B_O=0xCE, + LKD01_INDEX_BTK_37_CL_CUT20_180TURNWAIT_L=0xCF, + LKD01_INDEX_BTK_37_CL_CUT20_180TURN_O=0xD0, + LKD01_INDEX_BTK_28_CL_KAKAE_L=0xD1, + LKD01_INDEX_BTK_28_CL_MIAGE_L=0xD2, + LKD01_INDEX_BTK_26_CL_CUT01_STANDINGWAIT_L=0xD3, + LKD01_INDEX_BTK_26_CL_CUT02_SURPRISE_O=0xD4, + LKD01_INDEX_BTK_26_CL_CUT02_SURPRISEWAIT_L=0xD5, + LKD01_INDEX_BTK_26_CL_CUT03_FACEAWAY_O=0xD6, + LKD01_INDEX_BTK_26_CL_CUT03_FACEAWAYWAIT_L=0xD7, + LKD01_INDEX_BTK_26_CL_CUT05_BLANKLYWAIT_L=0xD8, + LKD01_INDEX_BTK_26_CL_CUT08_LOOKFORROW_L=0xD9, + LKD01_INDEX_BTK_26_CL_CUT08_LOOKFORROWWAIT_L=0xDA, + LKD01_INDEX_BTK_26_CL_CUT09_SHOCK2ND_O=0xDB, + LKD01_INDEX_BTK_26_CL_CUT09_SHOCK_O=0xDC, + LKD01_INDEX_BTK_26_CL_CUT11_LOOKUPWAIT_L=0xDD, + LKD01_INDEX_BTK_26_CL_CUT13_SURPRISE_O=0xDE, + LKD01_INDEX_BTK_26_CL_CUT13_SURPRISEWAIT_L=0xDF, + LKD01_INDEX_BTK_26_CL_CUT13_TURNAWAY_O=0xE0, + LKD01_INDEX_BTK_26_CL_CUT13_TURNAWAYWAIT_L=0xE1, + LKD01_INDEX_BTK_46_CL_CUT01_WAIT_L=0xE2, + LKD01_INDEX_BTK_46_CL_CUT06_LOOKUP_O=0xE3, + LKD01_INDEX_BTK_46_CL_CUT06_LOOKUPWAIT_L=0xE4, + LKD01_INDEX_BTK_46_CL_CUT10_LOOKBACK_O=0xE5, + LKD01_INDEX_BTK_46_CL_CUT10_LOOKBACKWAIT_L=0xE6, + LKD01_INDEX_BTK_46_CL_CUT12_LOOKUPB_O=0xE7, + LKD01_INDEX_BTK_46_CL_CUT12_LOOKUPBWAIT_L=0xE8, + LKD01_INDEX_BTK_46_CL_CUT16_WAIT_L=0xE9, + LKD01_INDEX_BTK_46_CL_CUT25_WAIT_L=0xEA, + LKD01_INDEX_BTK_TITEMGET=0xEB, + LKD01_INDEX_BTK_D43_CL_CUT5_MIAGERU_O=0xEC, + LKD01_INDEX_BTK_D43_CL_CUT6_WAIT_L=0xED, + LKD01_INDEX_BTK_D43_CL_CUT5_WAIT_L=0xEE, + LKD01_INDEX_BTK_D43_CL_CUT5_TAORERU_O=0xEF, + LKD01_INDEX_BTK_D43_CL_CUT4_WAIT_L=0xF0, + LKD01_INDEX_BTK_D43_CL_CUT4_JUMP_O=0xF1, + LKD01_INDEX_BTK_D43_CL_CUT2_WAIT_L=0xF2, + LKD01_INDEX_BTK_D43_CL_CUT24_WAIT_L=0xF3, + LKD01_INDEX_BTK_D43_CL_CUT24_WAIT_=0xF4, + LKD01_INDEX_BTK_D43_CL_CUT21_WAIT_L=0xF5, + LKD01_INDEX_BTK_D43_CL_CUT21_NOBASU_O=0xF6, + LKD01_INDEX_BTK_D43_CL_CUT19_UKABU_O=0xF7, + LKD01_INDEX_BTK_D43_CL_CUT19_SLOWFUNBARI_L=0xF8, + LKD01_INDEX_BTK_D43_CL_CUT19_MIAGEWAIT_L=0xF9, + LKD01_INDEX_BTK_D43_CL_CUT19_KIZUKU_O=0xFA, + LKD01_INDEX_BTK_D43_CL_CUT19_FUNBARI_L=0xFB, + LKD01_INDEX_BTK_D43_CL_CUT19=0xFC, + LKD01_INDEX_BTK_D43_CL_CUT10_WAIT_L=0xFD, + LKD01_INDEX_BTK_42_CL_CUT17_O=0xFE, + LKD01_INDEX_BTK_42_CL_CUT10_O=0xFF, + LKD01_INDEX_BTK_42_CL_CUT13_O=0x100, + LKD01_INDEX_BTK_42_CL_CUT15_O=0x101, + LKD01_INDEX_BTK_42_CL_CUT16_L=0x102, + LKD01_INDEX_BTK_42_CL_CUT19_L=0x103, + LKD01_INDEX_BTK_42_CL_CUT1_L=0x104, + LKD01_INDEX_BTK_42_CL_CUT20_L=0x105, + LKD01_INDEX_BTK_42_CL_CUT25_L=0x106, + LKD01_INDEX_BTK_42_CL_CUT28_O=0x107, + LKD01_INDEX_BTK_42_CL_CUT29_L=0x108, + LKD01_INDEX_BTK_42_CL_CUT44A_O=0x109, + LKD01_INDEX_BTK_42_CL_CUT44B_O=0x10A, + LKD01_INDEX_BTK_42_CL_CUT44C_O=0x10B, + LKD01_INDEX_BTK_42_CL_CUT45B_O=0x10C, + LKD01_INDEX_BTK_42_CL_CUT45C_L=0x10D, + LKD01_INDEX_BTK_42_CL_CUT45_L=0x10E, + LKD01_INDEX_BTK_42_CL_CUT46_L=0x10F, + LKD01_INDEX_BTK_42_CL_CUT48_O=0x110, + LKD01_INDEX_BTK_CL_DEFOLT_00=0x111, + LKD01_INDEX_BTK_35_CL_CUT1_CUT5=0x112, + LKD01_INDEX_BTK_35_CL_CUT8_WAIT_CUT18=0x113, + LKD01_INDEX_BTK_36_CUT1_ALL=0x114, + LKD01_INDEX_BTK_35_CL_CUT8_WAIT_L=0x115, + LKD01_INDEX_BTK_35_CL_CUT8_KAMAETEBIKU_O=0x116, + LKD01_INDEX_BTK_35_CL_CUT5_HAKKENWAIT_O=0x117, + LKD01_INDEX_BTK_35_CL_CUT5_HAKKEN_O=0x118, + LKD01_INDEX_BTK_35_CL_CUT18_MAWARIKUMI_L=0x119, + + /* BTP */ + LKD01_INDEX_BTP_25_CL_CUT29_NOD_L=0x11C, + LKD01_INDEX_BTP_33_CL_TE_MOYOU_O=0x11D, + LKD01_INDEX_BTP_33_CL_TE_MIRU_L=0x11E, + LKD01_INDEX_BTP_30_CL_UNAZUKI_O=0x11F, + LKD01_INDEX_BTP_29_CL_MSHENKA_O=0x120, + LKD01_INDEX_BTP_29_CL_MITE_UNAZUKU_O=0x121, + LKD01_INDEX_BTP_29_CL_MITE_SYOUMENN_O=0x122, + LKD01_INDEX_BTP_28_CL_AISATU_O=0x123, + LKD01_INDEX_BTP_25_CL_CUT37_TURNRUN_O=0x124, + LKD01_INDEX_BTP_25_CL_CUT36_TURNWAIT_L=0x125, + LKD01_INDEX_BTP_25_CL_CUT36_TURN_O=0x126, + LKD01_INDEX_BTP_25_CL_CUT35_STOPTURNWAIT_L=0x127, + LKD01_INDEX_BTP_25_CL_CUT35_STOPTURN_O=0x128, + LKD01_INDEX_BTP_25_CL_CUT35_ADMIREWAIT_L=0x129, + LKD01_INDEX_BTP_25_CL_CUT33_TURNWAIT_L=0x12A, + LKD01_INDEX_BTP_25_CL_CUT33_TURN_O=0x12B, + LKD01_INDEX_BTP_25_CL_CUT33_STOPWAIT_L=0x12C, + LKD01_INDEX_BTP_25_CL_CUT32_STOP_O=0x12D, + LKD01_INDEX_BTP_25_CL_CUT31_SURPRISEWAIT_L=0x12E, + LKD01_INDEX_BTP_25_CL_CUT31_SURPRISE_O=0x12F, + LKD01_INDEX_BTP_33_CL_TEAGE_L=0x130, + LKD01_INDEX_BTP_25_CL_CUT28_WAIT_L=0x131, + LKD01_INDEX_BTP_25_CL_CUT22_SURPRISE_O=0x132, + LKD01_INDEX_BTP_25_CL_CUT22_MABUSII_L=0x133, + LKD01_INDEX_BTP_25_CL_CUT16_LOOKTWAIT_L=0x134, + LKD01_INDEX_BTP_25_CL_CUT16_LOOKT_O=0x135, + LKD01_INDEX_BTP_25_CL_CUT14_HEARWAIT_L=0x136, + LKD01_INDEX_BTP_25_CL_CUT08_SURPRISEWAIT_L=0x137, + LKD01_INDEX_BTP_25_CL_CUT08_SURPRISE_O=0x138, + LKD01_INDEX_BTP_25_CL_CUT01_LOOKWAIT_L=0x139, + LKD01_INDEX_BTP_24_CL_CUT32_FLYMOVE_L=0x13A, + LKD01_INDEX_BTP_24_CL_CUT27_FLY_L=0x13B, + LKD01_INDEX_BTP_24_CL_CUT26_STANDUPWAIT_L=0x13C, + LKD01_INDEX_BTP_24_CL_CUT26_STANDUP_L=0x13D, + LKD01_INDEX_BTP_24_CL_CUT20_LOOKUP_L=0x13E, + LKD01_INDEX_BTP_24_CL_CUT16_FAVEUPWAIT_L=0x13F, + LKD01_INDEX_BTP_24_CL_CUT15_FACEUP_O=0x140, + LKD01_INDEX_BTP_24_CL_CUT14_KNOCKDOWNWAIT_L=0x141, + LKD01_INDEX_BTP_24_CL_CUT13_KNOCKDOWN_O=0x142, + LKD01_INDEX_BTP_24_CL_CUT12_LINKFLY_O=0x143, + LKD01_INDEX_BTP_24_CL_CUT10_FACEUP_L=0x144, + LKD01_INDEX_BTP_24_CL_CUT09_POSEWAIT_L=0x145, + LKD01_INDEX_BTP_24_CL_CUT09_HATWAIT_O=0x146, + LKD01_INDEX_BTP_24_CL_CUT07_DASH_O=0x147, + LKD01_INDEX_BTP_24_CL_CUT05_LOOKMSWAIT_L=0x148, + LKD01_INDEX_BTP_24_CL_CUT05_LOOKMASTER_O=0x149, + LKD01_INDEX_BTP_24_CL_CUT03_STEPBACKWAIT_L=0x14A, + LKD01_INDEX_BTP_24_CL_CUT03_STEPBACK_O=0x14B, + LKD01_INDEX_BTP_24_CL_CUT01_STOPWAIT_L=0x14C, + LKD01_INDEX_BTP_24_CL_CUT01_RUNSTOP_O=0x14D, + LKD01_INDEX_BTP_18_CL_CUT17_FWAIT_L=0x14E, + LKD01_INDEX_BTP_45_CL_CUT11_LOOKSHIPWAIT_L=0x14F, + LKD01_INDEX_BTP_45_CL_CUT07_LOOKWAIT_L=0x150, + LKD01_INDEX_BTP_45_CL_CUT11_LOOKSHIP_O=0x151, + LKD01_INDEX_BTP_45_CL_CUT01_WAIT_L=0x152, + LKD01_INDEX_BTP_45_CL_CUT11_STANDWAIT_L=0x153, + LKD01_INDEX_BTP_45_CL_CUT12_SINSUI_L=0x154, + LKD01_INDEX_BTP_TMCLINK203=0x155, + LKD01_INDEX_BTP_47_CL_NOTICEWAIT_L=0x156, + LKD01_INDEX_BTP_21_CL_CUT12B_O=0x157, + LKD01_INDEX_BTP_37_CL_CUT12_FAINTAWAY_L=0x158, + LKD01_INDEX_BTP_37_CL_CUT17_WAKEUPWAIT_L=0x159, + LKD01_INDEX_BTP_37_CL_CUT17_WAKEUP_O=0x15A, + LKD01_INDEX_BTP_37_CL_CUT18_GETUPWAIT_L=0x15B, + LKD01_INDEX_BTP_37_CL_CUT18_GETUP_O=0x15C, + LKD01_INDEX_BTP_37_CL_CUT20_180TURNWAIT_L=0x15D, + LKD01_INDEX_BTP_37_CL_CUT20_180TURN_O=0x15E, + LKD01_INDEX_BTP_37_CL_CUT24_HANDUPWAIT_L=0x15F, + LKD01_INDEX_BTP_37_CL_CUT24_HANDUP_O=0x160, + LKD01_INDEX_BTP_37_CL_CUT24_SMILING_L=0x161, + LKD01_INDEX_BTP_28_CL_KAKAE_L=0x162, + LKD01_INDEX_BTP_28_CL_MIAGE_L=0x163, + LKD01_INDEX_BTP_26_CL_CUT01_STANDINGWAIT_L=0x164, + LKD01_INDEX_BTP_26_CL_CUT02_SURPRISE_O=0x165, + LKD01_INDEX_BTP_26_CL_CUT02_SURPRISEWAIT_L=0x166, + LKD01_INDEX_BTP_26_CL_CUT03_FACEAWAY_O=0x167, + LKD01_INDEX_BTP_26_CL_CUT03_FACEAWAYWAIT_L=0x168, + LKD01_INDEX_BTP_26_CL_CUT05_BLANKLYWAIT_L=0x169, + LKD01_INDEX_BTP_26_CL_CUT08_LOOKFORROW_L=0x16A, + LKD01_INDEX_BTP_26_CL_CUT08_LOOKFORROWWAIT_L=0x16B, + LKD01_INDEX_BTP_26_CL_CUT08_SHOCK2ND_O=0x16C, + LKD01_INDEX_BTP_26_CL_CUT08_SHOCK_O=0x16D, + LKD01_INDEX_BTP_26_CL_CUT08_SHOCKWAIT_L=0x16E, + LKD01_INDEX_BTP_26_CL_CUT11_LOOKUPWAIT_L=0x16F, + LKD01_INDEX_BTP_26_CL_CUT13_SURPRISE_O=0x170, + LKD01_INDEX_BTP_26_CL_CUT13_SURPRISEWAIT_L=0x171, + LKD01_INDEX_BTP_26_CL_CUT13_TURNAWAY_O=0x172, + LKD01_INDEX_BTP_26_CL_CUT13_TURNAWAYWAIT_L=0x173, + LKD01_INDEX_BTP_46_CL_CUT01_WAIT_L=0x174, + LKD01_INDEX_BTP_46_CL_CUT01_WAITB_L=0x175, + LKD01_INDEX_BTP_46_CL_CUT06_LOOKUP_O=0x176, + LKD01_INDEX_BTP_46_CL_CUT06_LOOKUPWAIT_L=0x177, + LKD01_INDEX_BTP_46_CL_CUT10_LOOKBACK_O=0x178, + LKD01_INDEX_BTP_46_CL_CUT10_LOOKBACKWAIT_L=0x179, + LKD01_INDEX_BTP_46_CL_CUT12_LOOKUPB_O=0x17A, + LKD01_INDEX_BTP_46_CL_CUT12_LOOKUPBWAIT_L=0x17B, + LKD01_INDEX_BTP_46_CL_CUT16_WAIT_L=0x17C, + LKD01_INDEX_BTP_46_CL_CUT25_WAIT_L=0x17D, + LKD01_INDEX_BTP_31_CL_CUT06_PLAYEND_L=0x17E, + LKD01_INDEX_BTP_TITEMGET=0x17F, + LKD01_INDEX_BTP_D43_CL_CUT6_WAIT_L=0x180, + LKD01_INDEX_BTP_D43_CL_CUT5_WAIT_L=0x181, + LKD01_INDEX_BTP_D43_CL_CUT5_TAORERU_O=0x182, + LKD01_INDEX_BTP_D43_CL_CUT5_MIAGERU_O=0x183, + LKD01_INDEX_BTP_D43_CL_CUT4_WAIT_L=0x184, + LKD01_INDEX_BTP_D43_CL_CUT4_JUMP_O=0x185, + LKD01_INDEX_BTP_D43_CL_CUT2_WAIT_O=0x186, + LKD01_INDEX_BTP_D43_CL_CUT24_WAIT_L=0x187, + LKD01_INDEX_BTP_D43_CL_CUT21_WAIT_L=0x188, + LKD01_INDEX_BTP_D43_CL_CUT21_NOBASU_O=0x189, + LKD01_INDEX_BTP_D43_CL_CUT19_UKABU_O=0x18A, + LKD01_INDEX_BTP_D43_CL_CUT19_SLOWFUNBARI_L=0x18B, + LKD01_INDEX_BTP_D43_CL_CUT19_MIAGEWAIT_L=0x18C, + LKD01_INDEX_BTP_D43_CL_CUT19_KIZUKU_O=0x18D, + LKD01_INDEX_BTP_D43_CL_CUT19_FUNBARI_L=0x18E, + LKD01_INDEX_BTP_D43_CL_CUT10_WAIT_L=0x18F, + LKD01_INDEX_BTP_42_CL_CUT1_L=0x190, + LKD01_INDEX_BTP_42_CL_CUT10_L=0x191, + LKD01_INDEX_BTP_42_CL_CUT13_O=0x192, + LKD01_INDEX_BTP_42_CL_CUT15_O=0x193, + LKD01_INDEX_BTP_42_CL_CUT16_L=0x194, + LKD01_INDEX_BTP_42_CL_CUT17_O=0x195, + LKD01_INDEX_BTP_42_CL_CUT19_L=0x196, + LKD01_INDEX_BTP_42_CL_CUT20_L=0x197, + LKD01_INDEX_BTP_42_CL_CUT25_L=0x198, + LKD01_INDEX_BTP_42_CL_CUT28_O=0x199, + LKD01_INDEX_BTP_42_CL_CUT29_L=0x19A, + LKD01_INDEX_BTP_42_CL_CUT44A_O=0x19B, + LKD01_INDEX_BTP_42_CL_CUT44B_O=0x19C, + LKD01_INDEX_BTP_42_CL_CUT44C_O=0x19D, + LKD01_INDEX_BTP_42_CL_CUT45_L=0x19E, + LKD01_INDEX_BTP_42_CL_CUT45B_O=0x19F, + LKD01_INDEX_BTP_42_CL_CUT45C_L=0x1A0, + LKD01_INDEX_BTP_42_CL_CUT46_L=0x1A1, + LKD01_INDEX_BTP_42_CL_CUT48_O=0x1A2, + LKD01_INDEX_BTP_10_CL_CUT11_LOOKSKY_O=0x1A3, + LKD01_INDEX_BTP_35_CL_CUT1_WALK_L=0x1A4, + LKD01_INDEX_BTP_35_CL_CUT18_MAWARIKUMI_L=0x1A5, + LKD01_INDEX_BTP_35_CL_CUT5_HAKKEN_O=0x1A6, + LKD01_INDEX_BTP_35_CL_CUT8_KAMAETEBIKU_O=0x1A7, + LKD01_INDEX_BTP_35_CL_CUT8_WAIT_L=0x1A8, + LKD01_INDEX_BTP_36_CL_CUT1_HAAHAA_WAIT_L=0x1A9, + LKD01_INDEX_BTP_36_CL_CUT1_HURIKAERI_O=0x1AA, + LKD01_INDEX_BTP_36_CL_CUT1_WAIT_L=0x1AB, + LKD01_INDEX_BTP_TTAKTFUJIN=0x1AC, + LKD01_INDEX_BTP_TTAKTCHISIN=0x1AD, + LKD01_INDEX_BTP_TWARPOUT=0x1AE, + LKD01_INDEX_BTP_TWARPOUTFIRST=0x1AF, + LKD01_INDEX_BTP_35_CL_CUT5_HAKKENWAIT_O=0x1B0, +}; +#elif VERSION == VERSION_JPN enum LKD01_RES_FILE_INDEX { /* BCKS */ LKD01_INDEX_BCK_24_CL_CUT01_RUNSTOP_O=0x5, diff --git a/include/d/res/res_mgst.h b/include/d/res/res_mgst.h index 8f6e38501..1563e9cb4 100644 --- a/include/d/res/res_mgst.h +++ b/include/d/res/res_mgst.h @@ -37,6 +37,25 @@ enum MGST_RES_FILE_ID { // IDs and indexes are synced MGST_BTI_MS_SHIPFONT_Y_BIG=0x20, MGST_BTI_MS_SHIPFONT_Z=0x21, }; +#elif VERSION == VERSION_DEMO +enum MGST_RES_FILE_ID { // IDs and indexes are synced + /* ROOT */ + MGST_ARC_MGST=0x0, + + /* SCRN */ + MGST_BLO_SHIP_RACE1=0x5, + + /* TIMG */ + MGST_BTI_SHIPFONT_1=0x8, + MGST_BTI_SHIPFONT_1_2=0x9, + MGST_BTI_SHIPFONT_2=0xA, + MGST_BTI_SHIPFONT_2_2=0xB, + MGST_BTI_SHIPFONT_3=0xC, + MGST_BTI_SHIPFONT_3_2=0xD, + MGST_BTI_SHIPFONT_EX=0xE, + MGST_BTI_SHIPFONT_G_BIG=0xF, + MGST_BTI_SHIPFONT_O=0x10, +}; #else enum MGST_RES_FILE_ID { // IDs and indexes are synced /* SCRN */ diff --git a/include/d/res/res_mgtem.h b/include/d/res/res_mgtem.h index a3702ade8..2bdfe4ef3 100644 --- a/include/d/res/res_mgtem.h +++ b/include/d/res/res_mgtem.h @@ -3,7 +3,37 @@ #include "global.h" -#if VERSION <= VERSION_JPN +#if VERSION == VERSION_DEMO +enum MGTEM_RES_FILE_ID { // IDs and indexes are synced + /* ROOT */ + MGTEM_ARC_MGTEM=0x0, + + /* SCRN */ + MGTEM_BLO_SHIP_RACE2=0x5, + + /* TIMG */ + MGTEM_BTI_SHIPFONT_A=0x8, + MGTEM_BTI_SHIPFONT_C_BIG=0x9, + MGTEM_BTI_SHIPFONT_D=0xA, + MGTEM_BTI_SHIPFONT_E=0xB, + MGTEM_BTI_SHIPFONT_EX=0xC, + MGTEM_BTI_SHIPFONT_E_BIG=0xD, + MGTEM_BTI_SHIPFONT_F_BIG=0xE, + MGTEM_BTI_SHIPFONT_G=0xF, + MGTEM_BTI_SHIPFONT_G_BIG=0x10, + MGTEM_BTI_SHIPFONT_I=0x11, + MGTEM_BTI_SHIPFONT_L=0x12, + MGTEM_BTI_SHIPFONT_M=0x13, + MGTEM_BTI_SHIPFONT_N=0x14, + MGTEM_BTI_SHIPFONT_O=0x15, + MGTEM_BTI_SHIPFONT_P_BIG=0x16, + MGTEM_BTI_SHIPFONT_R_BIG=0x17, + MGTEM_BTI_SHIPFONT_T=0x18, + MGTEM_BTI_SHIPFONT_T_BIG=0x19, + MGTEM_BTI_SHIPFONT_U=0x1A, + MGTEM_BTI_SHIPFONT_Y_BIG=0x1B, +}; +#elif VERSION == VERSION_JPN enum MGTEM_RES_FILE_ID { // IDs and indexes are synced /* SCRN */ MGTEM_BLO_SHIP_RACE2=0x4, diff --git a/include/d/res/res_mozo.h b/include/d/res/res_mozo.h index 3f9650b1d..da6c1d5fb 100644 --- a/include/d/res/res_mozo.h +++ b/include/d/res/res_mozo.h @@ -3,7 +3,36 @@ #include "global.h" -enum MOZO_RES_FILE_ID { // IDs and indexes are synced +#if VERSION == VERSION_DEMO +enum MOZO_RES_FILE_ID { + /* BCKS */ + MOZO_BCK_MOZ=0x0, + + /* BRK */ + MOZO_BRK_MOZ=0x2, + + /* BTK */ + MOZO_BTK_MOZ=0x3, + + /* BDLM */ + MOZO_BDL_MOZ=0x4, +}; + +enum MOZO_RES_FILE_INDEX { + /* BCKS */ + MOZO_INDEX_BCK_MOZ=0x6, + + /* BRK */ + MOZO_INDEX_BRK_MOZ=0x9, + + /* BTK */ + MOZO_INDEX_BTK_MOZ=0xC, + + /* BDLM */ + MOZO_INDEX_BDL_MOZ=0xF, +}; +#else +enum MOZO_RES_FILE_ID { /* BCKS */ MOZO_BCK_MOZ=0x6, @@ -17,4 +46,19 @@ enum MOZO_RES_FILE_ID { // IDs and indexes are synced MOZO_BTK_MOZ=0xF, }; +enum MOZO_RES_FILE_INDEX { + /* BCKS */ + MOZO_INDEX_BCK_MOZ=0x6, + + /* BDLM */ + MOZO_INDEX_BDL_MOZ=0x9, + + /* BRK */ + MOZO_INDEX_BRK_MOZ=0xC, + + /* BTK */ + MOZO_INDEX_BTK_MOZ=0xF, +}; +#endif + #endif /* RES_MOZO_H */ diff --git a/include/d/res/res_open1.h b/include/d/res/res_open1.h index 8a7ce351d..b8ff43b47 100644 --- a/include/d/res/res_open1.h +++ b/include/d/res/res_open1.h @@ -3,6 +3,7 @@ #include "global.h" +#if VERSION > VERSION_DEMO enum OPEN1_RES_FILE_ID { // IDs and indexes are synced /* SCRN */ OPEN1_BLO_OPENING=0x4, @@ -12,5 +13,6 @@ enum OPEN1_RES_FILE_ID { // IDs and indexes are synced OPEN1_BTI_DEMO_1=0x8, OPEN1_BTI_DEMO_2=0x9, }; +#endif #endif /* RES_OPEN1_H */ diff --git a/include/d/res/res_open2.h b/include/d/res/res_open2.h index ec9052950..e0b3b4a0c 100644 --- a/include/d/res/res_open2.h +++ b/include/d/res/res_open2.h @@ -3,11 +3,13 @@ #include "global.h" +#if VERSION > VERSION_DEMO enum OPEN2_RES_FILE_ID { // IDs and indexes are synced /* TIMG */ OPEN2_BTI_DEMO_3=0x3, OPEN2_BTI_DEMO_4=0x4, OPEN2_BTI_DEMO_4_2=0x5, }; +#endif #endif /* RES_OPEN2_H */ diff --git a/include/d/res/res_open3.h b/include/d/res/res_open3.h index 646f423f4..f494f5d4c 100644 --- a/include/d/res/res_open3.h +++ b/include/d/res/res_open3.h @@ -3,10 +3,12 @@ #include "global.h" +#if VERSION > VERSION_DEMO enum OPEN3_RES_FILE_ID { // IDs and indexes are synced /* TIMG */ OPEN3_BTI_DEMO_5=0x3, OPEN3_BTI_DEMO_6=0x4, }; +#endif #endif /* RES_OPEN3_H */ diff --git a/include/d/res/res_opening.h b/include/d/res/res_opening.h index 0e935a9de..9fe1de2b1 100644 --- a/include/d/res/res_opening.h +++ b/include/d/res/res_opening.h @@ -3,6 +3,7 @@ #include "global.h" +#if VERSION > VERSION_DEMO enum OPENING_RES_FILE_ID { // IDs and indexes are synced /* SCRN */ OPENING_BLO_OPENING=0x4, @@ -17,5 +18,6 @@ enum OPENING_RES_FILE_ID { // IDs and indexes are synced OPENING_BTI_DEMO_5=0xD, OPENING_BTI_DEMO_6=0xE, }; +#endif #endif /* RES_OPENING_H */ diff --git a/include/d/res/res_ph.h b/include/d/res/res_ph.h index c0ef1e750..2c0ec1e67 100644 --- a/include/d/res/res_ph.h +++ b/include/d/res/res_ph.h @@ -10,13 +10,23 @@ enum PH_RES_FILE_ID { // IDs and indexes are synced PH_BAS_BFLY=0x7, PH_BAS_BHUKKI=0x8, PH_BAS_BJUMP=0x9, +#if VERSION == VERSION_DEMO + PH_BAS_BUCHIWA=0xA, + PH_BAS_BUCHI_CHAKU=0xB, +#else PH_BAS_BUCHI_CHAKU=0xA, PH_BAS_BUCHIWA=0xB, +#endif PH_BAS_PAWAY=0xC, PH_BAS_PFLY=0xD, PH_BAS_PHUKKI=0xE, +#if VERSION == VERSION_DEMO + PH_BAS_PUCHIWA=0xF, + PH_BAS_PUCHI_CHAKU=0x10, +#else PH_BAS_PUCHI_CHAKU=0xF, PH_BAS_PUCHIWA=0x10, +#endif /* BCK */ PH_BCK_BCHAKUCHI=0x13, @@ -25,13 +35,23 @@ enum PH_RES_FILE_ID { // IDs and indexes are synced PH_BCK_BHUKKI=0x16, PH_BCK_BJAWS=0x17, PH_BCK_BJUMP=0x18, +#if VERSION == VERSION_DEMO + PH_BCK_BUCHIWA=0x19, + PH_BCK_BUCHI_CHAKU=0x1A, +#else PH_BCK_BUCHI_CHAKU=0x19, PH_BCK_BUCHIWA=0x1A, +#endif PH_BCK_PAWAY=0x1B, PH_BCK_PFLY=0x1C, PH_BCK_PHUKKI=0x1D, +#if VERSION == VERSION_DEMO + PH_BCK_PUCHIWA=0x1E, + PH_BCK_PUCHI_CHAKU=0x1F, +#else PH_BCK_PUCHI_CHAKU=0x1E, PH_BCK_PUCHIWA=0x1F, +#endif /* BDLM */ PH_BDL_PHB=0x22, diff --git a/include/d/res/res_roten.h b/include/d/res/res_roten.h index eceab72d0..dda946ff3 100644 --- a/include/d/res/res_roten.h +++ b/include/d/res/res_roten.h @@ -3,7 +3,32 @@ #include "global.h" -enum ROTEN_RES_FILE_ID { // IDs and indexes are synced +#if VERSION == VERSION_DEMO +enum ROTEN_RES_FILE_ID { + /* BDL */ + ROTEN_BDL_ROTEN02=0x0, + ROTEN_BDL_ROTEN03=0x1, + ROTEN_BDL_ROTEN04=0x2, + + /* DZB */ + ROTEN_DZB_ROTEN02=0x3, + ROTEN_DZB_ROTEN03=0x4, + ROTEN_DZB_ROTEN04=0x5, +}; + +enum ROTEN_RES_FILE_INDEX { + /* BDL */ + ROTEN_INDEX_BDL_ROTEN02=0x4, + ROTEN_INDEX_BDL_ROTEN03=0x5, + ROTEN_INDEX_BDL_ROTEN04=0x6, + + /* DZB */ + ROTEN_INDEX_DZB_ROTEN02=0x9, + ROTEN_INDEX_DZB_ROTEN03=0xA, + ROTEN_INDEX_DZB_ROTEN04=0xB, +}; +#else +enum ROTEN_RES_FILE_ID { /* BDL */ ROTEN_BDL_ROTEN02=0x4, ROTEN_BDL_ROTEN03=0x5, @@ -15,4 +40,17 @@ enum ROTEN_RES_FILE_ID { // IDs and indexes are synced ROTEN_DZB_ROTEN04=0xB, }; +enum ROTEN_RES_FILE_INDEX { + /* BDL */ + ROTEN_INDEX_BDL_ROTEN02=0x4, + ROTEN_INDEX_BDL_ROTEN03=0x5, + ROTEN_INDEX_BDL_ROTEN04=0x6, + + /* DZB */ + ROTEN_INDEX_DZB_ROTEN02=0x9, + ROTEN_INDEX_DZB_ROTEN03=0xA, + ROTEN_INDEX_DZB_ROTEN04=0xB, +}; +#endif + #endif /* RES_ROTEN_H */ diff --git a/include/d/res/res_rsh.h b/include/d/res/res_rsh.h index 49d93ddcb..c9d2dde8b 100644 --- a/include/d/res/res_rsh.h +++ b/include/d/res/res_rsh.h @@ -3,6 +3,83 @@ #include "global.h" +#if VERSION == VERSION_DEMO +enum RSH_RES_FILE_ID { + /* BAS */ + RSH_BAS_RS_WAIT01=0xD, + RSH_BAS_RS_WAIT02=0xE, + RSH_BAS_RS_PUSH=0x13, + RSH_BAS_RS_TALK01=0x14, + RSH_BAS_RS_TALK02=0x15, + RSH_BAS_RS_WALK=0x16, + RSH_BAS_RS_JAMP=0x1B, + RSH_BAS_RS_SWING=0x1C, + RSH_BAS_RS_TALK03=0x1D, + RSH_BAS_RS_TAME=0x1E, + + /* BCK */ + RSH_BCK_RS_WAIT01=0xF, + RSH_BCK_RS_WAIT02=0x10, + RSH_BCK_RS_PUSH=0x17, + RSH_BCK_RS_TALK01=0x18, + RSH_BCK_RS_TALK02=0x19, + RSH_BCK_RS_WALK=0x1A, + RSH_BCK_RS_JAMP=0x1F, + RSH_BCK_RS_SWING=0x20, + RSH_BCK_RS_TALK03=0x21, + RSH_BCK_RS_TAME=0x22, + + /* BMDM */ + RSH_BMD_SHOP_CURSOR01=0x4, + + /* BRK */ + RSH_BRK_SHOP_CURSOR01=0x5, + + /* BTP */ + RSH_BTP_RS_MABA01=0x11, + + /* BDLM */ + RSH_BDL_RS=0x12, +}; + +enum RSH_RES_FILE_INDEX { + /* BAS */ + RSH_INDEX_BAS_RS_WAIT01=0x8, + RSH_INDEX_BAS_RS_WAIT02=0x9, + RSH_INDEX_BAS_RS_PUSH=0xA, + RSH_INDEX_BAS_RS_TALK01=0xB, + RSH_INDEX_BAS_RS_TALK02=0xC, + RSH_INDEX_BAS_RS_WALK=0xD, + RSH_INDEX_BAS_RS_JAMP=0xE, + RSH_INDEX_BAS_RS_SWING=0xF, + RSH_INDEX_BAS_RS_TALK03=0x10, + RSH_INDEX_BAS_RS_TAME=0x11, + + /* BCK */ + RSH_INDEX_BCK_RS_WAIT01=0x14, + RSH_INDEX_BCK_RS_WAIT02=0x15, + RSH_INDEX_BCK_RS_PUSH=0x16, + RSH_INDEX_BCK_RS_TALK01=0x17, + RSH_INDEX_BCK_RS_TALK02=0x18, + RSH_INDEX_BCK_RS_WALK=0x19, + RSH_INDEX_BCK_RS_JAMP=0x1A, + RSH_INDEX_BCK_RS_SWING=0x1B, + RSH_INDEX_BCK_RS_TALK03=0x1C, + RSH_INDEX_BCK_RS_TAME=0x1D, + + /* BMDM */ + RSH_INDEX_BMD_SHOP_CURSOR01=0x20, + + /* BRK */ + RSH_INDEX_BRK_SHOP_CURSOR01=0x23, + + /* BTP */ + RSH_INDEX_BTP_RS_MABA01=0x26, + + /* BDLM */ + RSH_INDEX_BDL_RS=0x29, +}; +#else enum RSH_RES_FILE_ID { // IDs and indexes are synced /* BAS */ RSH_BAS_RS_JAMP=0x8, @@ -40,5 +117,6 @@ enum RSH_RES_FILE_ID { // IDs and indexes are synced /* BTP */ RSH_BTP_RS_MABA01=0x29, }; +#endif #endif /* RES_RSH_H */ diff --git a/include/d/res/res_sh.h b/include/d/res/res_sh.h index ac505418a..f2371c607 100644 --- a/include/d/res/res_sh.h +++ b/include/d/res/res_sh.h @@ -10,8 +10,13 @@ enum SH_RES_FILE_ID { // IDs and indexes are synced SH_BAS_BFLY=0x7, SH_BAS_BHUKKI=0x8, SH_BAS_BJUMP=0x9, +#if VERSION == VERSION_DEMO + SH_BAS_BUCHIWA=0xA, + SH_BAS_BUCHI_CHAKU=0xB, +#else SH_BAS_BUCHI_CHAKU=0xA, SH_BAS_BUCHIWA=0xB, +#endif SH_BAS_PAWAY=0xC, SH_BAS_PFLY=0xD, SH_BAS_PHUKKI=0xE, @@ -25,13 +30,23 @@ enum SH_RES_FILE_ID { // IDs and indexes are synced SH_BCK_BHUKKI=0x16, SH_BCK_BJAWS=0x17, SH_BCK_BJUMP=0x18, +#if VERSION == VERSION_DEMO + SH_BCK_BUCHIWA=0x19, + SH_BCK_BUCHI_CHAKU=0x1A, +#else SH_BCK_BUCHI_CHAKU=0x19, SH_BCK_BUCHIWA=0x1A, +#endif SH_BCK_PAWAY=0x1B, SH_BCK_PFLY=0x1C, SH_BCK_PHUKKI=0x1D, +#if VERSION == VERSION_DEMO + SH_BCK_PUCHIWA=0x1E, + SH_BCK_PUCHI_CHAKU=0x1F, +#else SH_BCK_PUCHI_CHAKU=0x1E, SH_BCK_PUCHIWA=0x1F, +#endif /* BMDM */ SH_BMD_SHB=0x22, diff --git a/include/d/res/res_sitem.h b/include/d/res/res_sitem.h index d9eec92a0..caa95b382 100644 --- a/include/d/res/res_sitem.h +++ b/include/d/res/res_sitem.h @@ -3,6 +3,22 @@ #include "global.h" +#if VERSION == VERSION_DEMO +enum SITEM_RES_FILE_ID { // IDs and indexes are synced + /* BDL */ + SITEM_BDL_KMI_01=0x6, + SITEM_BDL_KMI_02=0x7, + + /* BDLM */ + SITEM_BDL_KMI_00=0xA, + + /* BRK */ + SITEM_BRK_KMI_00=0xD, + + /* TEX */ + SITEM_BTI_SITEM=0x10, +}; +#else enum SITEM_RES_FILE_ID { // IDs and indexes are synced /* BDL */ SITEM_BDL_KMI_00=0x4, @@ -12,5 +28,6 @@ enum SITEM_RES_FILE_ID { // IDs and indexes are synced /* TEX */ SITEM_BTI_SITEM=0x9, }; +#endif #endif /* RES_SITEM_H */ diff --git a/include/d/res/res_timer.h b/include/d/res/res_timer.h index d4ab2bf29..277f42fc0 100644 --- a/include/d/res/res_timer.h +++ b/include/d/res/res_timer.h @@ -3,7 +3,15 @@ #include "global.h" -#if VERSION <= VERSION_JPN +#if VERSION == VERSION_DEMO +enum TIMER_RES_FILE_ID { // IDs and indexes are synced + /* ROOT */ + TIMER_ARC_TIMER=0x0, + + /* SCRN */ + TIMER_BLO_SHIP_RACE0=0x4, +}; +#elif VERSION <= VERSION_JPN enum TIMER_RES_FILE_ID { // IDs and indexes are synced /* SCRN */ TIMER_BLO_SHIP_RACE0=0x3, diff --git a/include/d/res/res_yfire_00.h b/include/d/res/res_yfire_00.h index 488d6bac5..def4fcb47 100644 --- a/include/d/res/res_yfire_00.h +++ b/include/d/res/res_yfire_00.h @@ -3,6 +3,20 @@ #include "global.h" +#if VERSION == VERSION_DEMO +enum YFIRE_00_RES_FILE_ID { // IDs and indexes are synced + /* BMDM */ + YFIRE_00_BMD_YFIRB_00=0x5, + YFIRE_00_BMD_YFIRE_00=0x6, + + /* BTK */ + YFIRE_00_BTK_YFIRB_00=0x9, + YFIRE_00_BTK_YFIRE_00=0xA, + + /* BRK */ + YFIRE_00_BRK_YFIRE_00=0xD, +}; +#else enum YFIRE_00_RES_FILE_ID { // IDs and indexes are synced /* BMDM */ YFIRE_00_BMD_YFIRB_00=0x5, @@ -15,5 +29,6 @@ enum YFIRE_00_RES_FILE_ID { // IDs and indexes are synced YFIRE_00_BTK_YFIRB_00=0xC, YFIRE_00_BTK_YFIRE_00=0xD, }; +#endif #endif /* RES_YFIRE_00_H */ diff --git a/include/d/res/res_ylesr00.h b/include/d/res/res_ylesr00.h index cb13684db..47d2450fc 100644 --- a/include/d/res/res_ylesr00.h +++ b/include/d/res/res_ylesr00.h @@ -3,6 +3,41 @@ #include "global.h" +#if VERSION == VERSION_DEMO +enum YLESR00_RES_FILE_ID { + /* BCK */ + YLESR00_BCK_YLESR00=0x0, + + /* BMDM */ + YLESR00_BMD_YLESR00=0x1, + YLESR00_BMD_YHTFR00=0x4, + + /* BRK */ + YLESR00_BRK_YLESR00=0x2, + YLESR00_BRK_YHTFR00=0x5, + + /* BTK */ + YLESR00_BTK_YLESR00=0x3, + YLESR00_BTK_YHTFR00=0x6, +}; + +enum YLESR00_RES_FILE_INDEX { + /* BCK */ + YLESR00_INDEX_BCK_YLESR00=0x6, + + /* BMDM */ + YLESR00_INDEX_BMD_YLESR00=0x9, + YLESR00_INDEX_BMD_YHTFR00=0xA, + + /* BRK */ + YLESR00_INDEX_BRK_YLESR00=0xD, + YLESR00_INDEX_BRK_YHTFR00=0xE, + + /* BTK */ + YLESR00_INDEX_BTK_YLESR00=0x11, + YLESR00_INDEX_BTK_YHTFR00=0x12, +}; +#else enum YLESR00_RES_FILE_ID { // IDs and indexes are synced /* BCK */ YLESR00_BCK_YLESR00=0x6, @@ -19,5 +54,6 @@ enum YLESR00_RES_FILE_ID { // IDs and indexes are synced YLESR00_BTK_YHTFR00=0x11, YLESR00_BTK_YLESR00=0x12, }; +#endif #endif /* RES_YLESR00_H */ diff --git a/src/d/actor/d_a_ikari.cpp b/src/d/actor/d_a_ikari.cpp index 6029162da..e7efada4e 100644 --- a/src/d/actor/d_a_ikari.cpp +++ b/src/d/actor/d_a_ikari.cpp @@ -36,11 +36,19 @@ void daIkari_c::setMtx() { /* 000001C4-00000290 .text _createHeap__9daIkari_cFv */ BOOL daIkari_c::_createHeap() { static int ikari_bdl[5] = { +#if VERSION == VERSION_DEMO + IKARI_BMD_S_IKARI2, + IKARI_BMD_S_IKARI2, + IKARI_BMD_S_IKARI2, + IKARI_BMD_S_IKARI3, + IKARI_BMD_S_IKARI4, +#else IKARI_BDL_S_IKARI2, IKARI_BDL_S_IKARI2, IKARI_BDL_S_IKARI2, IKARI_BDL_S_IKARI3, IKARI_BDL_S_IKARI4, +#endif }; J3DModelData* modelData = diff --git a/src/d/actor/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp index 1b59b3372..f7c3ec8e7 100644 --- a/src/d/actor/d_a_mozo.cpp +++ b/src/d/actor/d_a_mozo.cpp @@ -105,13 +105,13 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 000007AC-00000A24 .text CreateHeap__8daMozo_cFv */ BOOL daMozo_c::CreateHeap() { - J3DModelData* mdlData = (J3DModelData*)dComIfG_getObjectRes("Mozo", MOZO_BDL_MOZ); + J3DModelData* mdlData = (J3DModelData*)dComIfG_getObjectRes("Mozo", MOZO_INDEX_BDL_MOZ); mDoExt_McaMorf* newMorf = new mDoExt_McaMorf( mdlData, 0, 0, - static_cast(dComIfG_getObjectRes("Mozo", MOZO_BCK_MOZ)), + static_cast(dComIfG_getObjectRes("Mozo", MOZO_INDEX_BCK_MOZ)), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, @@ -124,10 +124,10 @@ BOOL daMozo_c::CreateHeap() { mAnimMorf = newMorf; - m_brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Mozo", MOZO_BRK_MOZ); + m_brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Mozo", MOZO_INDEX_BRK_MOZ); JUT_ASSERT(0x16A, m_brk != NULL); - m_btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Mozo", MOZO_BTK_MOZ); + m_btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Mozo", MOZO_INDEX_BTK_MOZ); JUT_ASSERT(0x16D, m_btk != NULL); int brkInitResult = mBrkAnm.init(mdlData, m_brk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0); diff --git a/src/d/actor/d_a_obj_roten.cpp b/src/d/actor/d_a_obj_roten.cpp index 903b877cc..60273fc9b 100644 --- a/src/d/actor/d_a_obj_roten.cpp +++ b/src/d/actor/d_a_obj_roten.cpp @@ -37,14 +37,14 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { /* 000001A8-000002E4 .text CreateHeap__13daObj_Roten_cFv */ BOOL daObj_Roten_c::CreateHeap() { static u32 bdl_arc_idx[] = { - ROTEN_BDL_ROTEN02, - ROTEN_BDL_ROTEN03, - ROTEN_BDL_ROTEN04 + ROTEN_INDEX_BDL_ROTEN02, + ROTEN_INDEX_BDL_ROTEN03, + ROTEN_INDEX_BDL_ROTEN04 }; static u32 dzb_arc_idx[] = { - ROTEN_DZB_ROTEN02, - ROTEN_DZB_ROTEN03, - ROTEN_DZB_ROTEN04 + ROTEN_INDEX_DZB_ROTEN02, + ROTEN_INDEX_DZB_ROTEN03, + ROTEN_INDEX_DZB_ROTEN04 }; J3DModelData* modelData = static_cast(dComIfG_getObjectRes(M_arcname, bdl_arc_idx[mType]));