From 017eddf8ecd6f6bbb1a8f6fc7dfca38e900747b1 Mon Sep 17 00:00:00 2001 From: roeming Date: Fri, 25 Jul 2025 15:57:43 -0400 Subject: [PATCH] matching many more data objects --- config/GAFE01_00/config.yml | 1853 ++++++++++++++++++++++++++- config/GAFE01_00/foresta/splits.txt | 728 ++++++++++- configure.py | 365 ++++++ src/data/model/act_balloon.c | 7 +- src/data/model/act_bee.c | 7 +- src/data/model/act_f01_funa.c | 72 ++ src/data/model/act_f02_hera.c | 74 ++ src/data/model/act_f03_koi.c | 72 ++ src/data/model/act_f04_nisiki.c | 72 ++ src/data/model/act_f05_namazu.c | 72 ++ src/data/model/act_f06_bass.c | 72 ++ src/data/model/act_f07_bassm.c | 72 ++ src/data/model/act_f08_bassl.c | 72 ++ src/data/model/act_f09_gill.c | 72 ++ src/data/model/act_f10_oonamazu.c | 72 ++ src/data/model/act_f11_raigyo.c | 72 ++ src/data/model/act_f12_nigoi.c | 72 ++ src/data/model/act_f13_ugui.c | 72 ++ src/data/model/act_f14_oikawa.c | 72 ++ src/data/model/act_f15_tanago.c | 72 ++ src/data/model/act_f16_dojyo.c | 72 ++ src/data/model/act_f17_wakasagi.c | 72 ++ src/data/model/act_f18_ayu.c | 72 ++ src/data/model/act_f19_yamame.c | 72 ++ src/data/model/act_f20_iwana.c | 72 ++ src/data/model/act_f21_niji.c | 72 ++ src/data/model/act_f22_ito.c | 72 ++ src/data/model/act_f23_sake.c | 72 ++ src/data/model/act_f24_kingyo.c | 72 ++ src/data/model/act_f25_pirania.c | 72 ++ src/data/model/act_f26_aroana.c | 72 ++ src/data/model/act_f27_unagi.c | 74 ++ src/data/model/act_f28_akikan.c | 31 + src/data/model/act_f28_donko.c | 72 ++ src/data/model/act_f29_angel.c | 72 ++ src/data/model/act_f30_gupi.c | 72 ++ src/data/model/act_f30_nagagutu.c | 31 + src/data/model/act_f31_demekin.c | 72 ++ src/data/model/act_f31_taiya.c | 31 + src/data/model/act_f32_kaseki.c | 72 ++ src/data/model/act_f33_medaka.c | 72 ++ src/data/model/act_f34_piraluku.c | 72 ++ src/data/model/act_f35_zarigani.c | 72 ++ src/data/model/act_f36_kaeru.c | 69 + src/data/model/act_f37_kurage.c | 85 ++ src/data/model/act_f38_suzuki.c | 72 ++ src/data/model/act_f39_tai.c | 72 ++ src/data/model/act_f40_isidai.c | 72 ++ src/data/model/act_gyoei02.c | 39 + src/data/model/act_m_abura.c | 64 + src/data/model/act_m_akiakane.c | 64 + src/data/model/act_m_amenbo.c | 47 + src/data/model/act_m_ari.c | 32 + src/data/model/act_m_dango.c | 47 + src/data/model/act_m_danna.c | 47 + src/data/model/act_m_genji2.c | 73 ++ src/data/model/act_m_ginyanma.c | 64 + src/data/model/act_m_gomadara.c | 47 + src/data/model/act_m_hachi.c | 64 + src/data/model/act_m_higurashi.c | 64 + src/data/model/act_m_hirata.c | 47 + src/data/model/act_m_hitodama.c | 43 + src/data/model/act_m_house_goki.c | 47 + src/data/model/act_m_ka.c | 62 + src/data/model/act_m_kabuto.c | 47 + src/data/model/act_m_kamakiri.c | 48 + src/data/model/act_m_kanabun.c | 47 + src/data/model/act_m_kera.c | 33 + src/data/model/act_m_kiageha.c | 47 + src/data/model/act_m_kirigirisu.c | 48 + src/data/model/act_m_koorogi.c | 32 + src/data/model/act_m_kumo.c | 61 + src/data/model/act_m_maimai.c | 35 + src/data/model/act_m_matmushi.c | 32 + src/data/model/act_m_minmin.c | 64 + src/data/model/act_m_mino.c | 61 + src/data/model/act_m_miyama.c | 48 + src/data/model/act_m_monki.c | 47 + src/data/model/act_m_monshiro.c | 47 + src/data/model/act_m_nanahoshi.c | 51 + src/data/model/act_m_nokogiri.c | 47 + src/data/model/act_m_ohmurasaki.c | 47 + src/data/model/boy_model.c | 4 +- src/data/model/furniture_pull.c | 24 + src/data/model/furniture_push.c | 23 + src/data/model/furniture_stop.c | 18 + src/data/model/girl_model.c | 4 +- src/data/model/hnw_face.c | 13 + src/data/model/hnw_model.c | 197 +++ src/data/model/hnw_move.c | 23 + src/data/model/obj_cstump5.c | 22 +- src/data/model/obj_garagara.c | 9 +- src/data/model/player_anim.c | 1089 +++++++++++----- src/data/model/player_tool.c | 190 +-- src/data/model/rom_myhome_ug.c | 93 ++ src/data/npc/npc_1_get_pull_wait1.c | 56 + tools/converters/assetdis.py | 370 +++++- 97 files changed, 9282 insertions(+), 493 deletions(-) create mode 100644 src/data/model/act_f01_funa.c create mode 100644 src/data/model/act_f02_hera.c create mode 100644 src/data/model/act_f03_koi.c create mode 100644 src/data/model/act_f04_nisiki.c create mode 100644 src/data/model/act_f05_namazu.c create mode 100644 src/data/model/act_f06_bass.c create mode 100644 src/data/model/act_f07_bassm.c create mode 100644 src/data/model/act_f08_bassl.c create mode 100644 src/data/model/act_f09_gill.c create mode 100644 src/data/model/act_f10_oonamazu.c create mode 100644 src/data/model/act_f11_raigyo.c create mode 100644 src/data/model/act_f12_nigoi.c create mode 100644 src/data/model/act_f13_ugui.c create mode 100644 src/data/model/act_f14_oikawa.c create mode 100644 src/data/model/act_f15_tanago.c create mode 100644 src/data/model/act_f16_dojyo.c create mode 100644 src/data/model/act_f17_wakasagi.c create mode 100644 src/data/model/act_f18_ayu.c create mode 100644 src/data/model/act_f19_yamame.c create mode 100644 src/data/model/act_f20_iwana.c create mode 100644 src/data/model/act_f21_niji.c create mode 100644 src/data/model/act_f22_ito.c create mode 100644 src/data/model/act_f23_sake.c create mode 100644 src/data/model/act_f24_kingyo.c create mode 100644 src/data/model/act_f25_pirania.c create mode 100644 src/data/model/act_f26_aroana.c create mode 100644 src/data/model/act_f27_unagi.c create mode 100644 src/data/model/act_f28_akikan.c create mode 100644 src/data/model/act_f28_donko.c create mode 100644 src/data/model/act_f29_angel.c create mode 100644 src/data/model/act_f30_gupi.c create mode 100644 src/data/model/act_f30_nagagutu.c create mode 100644 src/data/model/act_f31_demekin.c create mode 100644 src/data/model/act_f31_taiya.c create mode 100644 src/data/model/act_f32_kaseki.c create mode 100644 src/data/model/act_f33_medaka.c create mode 100644 src/data/model/act_f34_piraluku.c create mode 100644 src/data/model/act_f35_zarigani.c create mode 100644 src/data/model/act_f36_kaeru.c create mode 100644 src/data/model/act_f37_kurage.c create mode 100644 src/data/model/act_f38_suzuki.c create mode 100644 src/data/model/act_f39_tai.c create mode 100644 src/data/model/act_f40_isidai.c create mode 100644 src/data/model/act_gyoei02.c create mode 100644 src/data/model/act_m_abura.c create mode 100644 src/data/model/act_m_akiakane.c create mode 100644 src/data/model/act_m_amenbo.c create mode 100644 src/data/model/act_m_ari.c create mode 100644 src/data/model/act_m_dango.c create mode 100644 src/data/model/act_m_danna.c create mode 100644 src/data/model/act_m_genji2.c create mode 100644 src/data/model/act_m_ginyanma.c create mode 100644 src/data/model/act_m_gomadara.c create mode 100644 src/data/model/act_m_hachi.c create mode 100644 src/data/model/act_m_higurashi.c create mode 100644 src/data/model/act_m_hirata.c create mode 100644 src/data/model/act_m_hitodama.c create mode 100644 src/data/model/act_m_house_goki.c create mode 100644 src/data/model/act_m_ka.c create mode 100644 src/data/model/act_m_kabuto.c create mode 100644 src/data/model/act_m_kamakiri.c create mode 100644 src/data/model/act_m_kanabun.c create mode 100644 src/data/model/act_m_kera.c create mode 100644 src/data/model/act_m_kiageha.c create mode 100644 src/data/model/act_m_kirigirisu.c create mode 100644 src/data/model/act_m_koorogi.c create mode 100644 src/data/model/act_m_kumo.c create mode 100644 src/data/model/act_m_maimai.c create mode 100644 src/data/model/act_m_matmushi.c create mode 100644 src/data/model/act_m_minmin.c create mode 100644 src/data/model/act_m_mino.c create mode 100644 src/data/model/act_m_miyama.c create mode 100644 src/data/model/act_m_monki.c create mode 100644 src/data/model/act_m_monshiro.c create mode 100644 src/data/model/act_m_nanahoshi.c create mode 100644 src/data/model/act_m_nokogiri.c create mode 100644 src/data/model/act_m_ohmurasaki.c create mode 100644 src/data/model/furniture_pull.c create mode 100644 src/data/model/furniture_push.c create mode 100644 src/data/model/furniture_stop.c create mode 100644 src/data/model/hnw_face.c create mode 100644 src/data/model/hnw_model.c create mode 100644 src/data/model/hnw_move.c create mode 100644 src/data/model/rom_myhome_ug.c create mode 100644 src/data/npc/npc_1_get_pull_wait1.c diff --git a/config/GAFE01_00/config.yml b/config/GAFE01_00/config.yml index 3f196663..a082ac76 100644 --- a/config/GAFE01_00/config.yml +++ b/config/GAFE01_00/config.yml @@ -27847,4 +27847,1855 @@ modules: binary: assets/grl_1_v.bin header: assets/grl_1_v.inc header_type: none - custom_type: vtx \ No newline at end of file + custom_type: vtx + + - symbol: act_f28_akikan_pal + binary: assets/act_f28_akikan_pal.bin + header: assets/act_f28_akikan_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f28_akikan_tex + binary: assets/act_f28_akikan_tex.bin + header: assets/act_f28_akikan_tex.inc + header_type: raw + + - symbol: act_f28_akikan_v + binary: assets/act_f28_akikan_v.bin + header: assets/act_f28_akikan_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f29_angel_pal + binary: assets/act_f29_angel_pal.bin + header: assets/act_f29_angel_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f29_angel_tex + binary: assets/act_f29_angel_tex.bin + header: assets/act_f29_angel_tex.inc + header_type: raw + + - symbol: act_f29_angel_a_v + binary: assets/act_f29_angel_a_v.bin + header: assets/act_f29_angel_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f29_angel_b_v + binary: assets/act_f29_angel_b_v.bin + header: assets/act_f29_angel_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f29_angel_c_v + binary: assets/act_f29_angel_c_v.bin + header: assets/act_f29_angel_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f26_aroana_pal + binary: assets/act_f26_aroana_pal.bin + header: assets/act_f26_aroana_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f26_aroana_tex + binary: assets/act_f26_aroana_tex.bin + header: assets/act_f26_aroana_tex.inc + header_type: raw + + - symbol: act_f26_aroana_a_v + binary: assets/act_f26_aroana_a_v.bin + header: assets/act_f26_aroana_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f26_aroana_b_v + binary: assets/act_f26_aroana_b_v.bin + header: assets/act_f26_aroana_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f26_aroana_c_v + binary: assets/act_f26_aroana_c_v.bin + header: assets/act_f26_aroana_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f18_ayu_pal + binary: assets/act_f18_ayu_pal.bin + header: assets/act_f18_ayu_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f18_ayu_tex + binary: assets/act_f18_ayu_tex.bin + header: assets/act_f18_ayu_tex.inc + header_type: raw + + - symbol: act_f18_ayu_a_v + binary: assets/act_f18_ayu_a_v.bin + header: assets/act_f18_ayu_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f18_ayu_b_v + binary: assets/act_f18_ayu_b_v.bin + header: assets/act_f18_ayu_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f18_ayu_c_v + binary: assets/act_f18_ayu_c_v.bin + header: assets/act_f18_ayu_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f08_bassl_pal + binary: assets/act_f08_bassl_pal.bin + header: assets/act_f08_bassl_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f08_bassl_tex + binary: assets/act_f08_bassl_tex.bin + header: assets/act_f08_bassl_tex.inc + header_type: raw + + - symbol: act_f08_bassl_a_v + binary: assets/act_f08_bassl_a_v.bin + header: assets/act_f08_bassl_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f08_bassl_b_v + binary: assets/act_f08_bassl_b_v.bin + header: assets/act_f08_bassl_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f08_bassl_c_v + binary: assets/act_f08_bassl_c_v.bin + header: assets/act_f08_bassl_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f07_bassm_pal + binary: assets/act_f07_bassm_pal.bin + header: assets/act_f07_bassm_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f07_bassm_tex + binary: assets/act_f07_bassm_tex.bin + header: assets/act_f07_bassm_tex.inc + header_type: raw + + - symbol: act_f07_bassm_a_v + binary: assets/act_f07_bassm_a_v.bin + header: assets/act_f07_bassm_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f07_bassm_b_v + binary: assets/act_f07_bassm_b_v.bin + header: assets/act_f07_bassm_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f07_bassm_c_v + binary: assets/act_f07_bassm_c_v.bin + header: assets/act_f07_bassm_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f06_bass_pal + binary: assets/act_f06_bass_pal.bin + header: assets/act_f06_bass_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f06_bass_tex + binary: assets/act_f06_bass_tex.bin + header: assets/act_f06_bass_tex.inc + header_type: raw + + - symbol: act_f06_bass_a_v + binary: assets/act_f06_bass_a_v.bin + header: assets/act_f06_bass_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f06_bass_b_v + binary: assets/act_f06_bass_b_v.bin + header: assets/act_f06_bass_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f06_bass_c_v + binary: assets/act_f06_bass_c_v.bin + header: assets/act_f06_bass_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f09_gill_pal + binary: assets/act_f09_gill_pal.bin + header: assets/act_f09_gill_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f09_gill_tex + binary: assets/act_f09_gill_tex.bin + header: assets/act_f09_gill_tex.inc + header_type: raw + + - symbol: act_f09_gill_a_v + binary: assets/act_f09_gill_a_v.bin + header: assets/act_f09_gill_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f09_gill_b_v + binary: assets/act_f09_gill_b_v.bin + header: assets/act_f09_gill_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f09_gill_c_v + binary: assets/act_f09_gill_c_v.bin + header: assets/act_f09_gill_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f31_demekin_pal + binary: assets/act_f31_demekin_pal.bin + header: assets/act_f31_demekin_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f31_demekin_tex + binary: assets/act_f31_demekin_tex.bin + header: assets/act_f31_demekin_tex.inc + header_type: raw + + - symbol: act_f31_demekin_a_v + binary: assets/act_f31_demekin_a_v.bin + header: assets/act_f31_demekin_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f31_demekin_b_v + binary: assets/act_f31_demekin_b_v.bin + header: assets/act_f31_demekin_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f31_demekin_c_v + binary: assets/act_f31_demekin_c_v.bin + header: assets/act_f31_demekin_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f16_dojyo_pal + binary: assets/act_f16_dojyo_pal.bin + header: assets/act_f16_dojyo_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f16_dojyo_tex + binary: assets/act_f16_dojyo_tex.bin + header: assets/act_f16_dojyo_tex.inc + header_type: raw + + - symbol: act_f16_dojyo_a_v + binary: assets/act_f16_dojyo_a_v.bin + header: assets/act_f16_dojyo_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f16_dojyo_b_v + binary: assets/act_f16_dojyo_b_v.bin + header: assets/act_f16_dojyo_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f16_dojyo_c_v + binary: assets/act_f16_dojyo_c_v.bin + header: assets/act_f16_dojyo_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f28_donko_pal + binary: assets/act_f28_donko_pal.bin + header: assets/act_f28_donko_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f28_donko_tex + binary: assets/act_f28_donko_tex.bin + header: assets/act_f28_donko_tex.inc + header_type: raw + + - symbol: act_f28_donko_a_v + binary: assets/act_f28_donko_a_v.bin + header: assets/act_f28_donko_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f28_donko_b_v + binary: assets/act_f28_donko_b_v.bin + header: assets/act_f28_donko_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f28_donko_c_v + binary: assets/act_f28_donko_c_v.bin + header: assets/act_f28_donko_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f01_funa_pal + binary: assets/act_f01_funa_pal.bin + header: assets/act_f01_funa_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f01_funa_tex + binary: assets/act_f01_funa_tex.bin + header: assets/act_f01_funa_tex.inc + header_type: raw + + - symbol: act_f01_funa_a_v + binary: assets/act_f01_funa_a_v.bin + header: assets/act_f01_funa_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f01_funa_b_v + binary: assets/act_f01_funa_b_v.bin + header: assets/act_f01_funa_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f01_funa_c_v + binary: assets/act_f01_funa_c_v.bin + header: assets/act_f01_funa_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f30_gupi_pal + binary: assets/act_f30_gupi_pal.bin + header: assets/act_f30_gupi_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f30_gupi_tex + binary: assets/act_f30_gupi_tex.bin + header: assets/act_f30_gupi_tex.inc + header_type: raw + + - symbol: act_f30_gupi_a_v + binary: assets/act_f30_gupi_a_v.bin + header: assets/act_f30_gupi_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f30_gupi_b_v + binary: assets/act_f30_gupi_b_v.bin + header: assets/act_f30_gupi_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f30_gupi_c_v + binary: assets/act_f30_gupi_c_v.bin + header: assets/act_f30_gupi_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f02_hera_pal + binary: assets/act_f02_hera_pal.bin + header: assets/act_f02_hera_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f02_hera_tex + binary: assets/act_f02_hera_tex.bin + header: assets/act_f02_hera_tex.inc + header_type: raw + + - symbol: act_f02_hera_a_v + binary: assets/act_f02_hera_a_v.bin + header: assets/act_f02_hera_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f02_hera_b_v + binary: assets/act_f02_hera_b_v.bin + header: assets/act_f02_hera_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f02_hera_c_v + binary: assets/act_f02_hera_c_v.bin + header: assets/act_f02_hera_c_v.inc + header_type: none + custom_type: vtx + + - symbol: int_nog_isidai_pal!.data:0x23c8a0 + binary: assets/act_f40_isidai/int_nog_isidai_pal.bin + header: assets/act_f40_isidai/int_nog_isidai_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f40_isidai_tex + binary: assets/act_f40_isidai_tex.bin + header: assets/act_f40_isidai_tex.inc + header_type: raw + + - symbol: act_f40_isidai_a_v + binary: assets/act_f40_isidai_a_v.bin + header: assets/act_f40_isidai_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f40_isidai_b_v + binary: assets/act_f40_isidai_b_v.bin + header: assets/act_f40_isidai_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f40_isidai_c_v + binary: assets/act_f40_isidai_c_v.bin + header: assets/act_f40_isidai_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f22_ito_pal + binary: assets/act_f22_ito_pal.bin + header: assets/act_f22_ito_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f22_ito_tex + binary: assets/act_f22_ito_tex.bin + header: assets/act_f22_ito_tex.inc + header_type: raw + + - symbol: act_f22_ito_a_v + binary: assets/act_f22_ito_a_v.bin + header: assets/act_f22_ito_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f22_ito_b_v + binary: assets/act_f22_ito_b_v.bin + header: assets/act_f22_ito_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f22_ito_c_v + binary: assets/act_f22_ito_c_v.bin + header: assets/act_f22_ito_c_v.inc + header_type: none + custom_type: vtx + + - symbol: int_nog_kaeru_pal!.data:0x23d5e0 + binary: assets/act_f36_kaeru/int_nog_kaeru_pal.bin + header: assets/act_f36_kaeru/int_nog_kaeru_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f36_kaeru_tex + binary: assets/act_f36_kaeru_tex.bin + header: assets/act_f36_kaeru_tex.inc + header_type: raw + + - symbol: act_f36_kaeru_a_v + binary: assets/act_f36_kaeru_a_v.bin + header: assets/act_f36_kaeru_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f36_kaeru_b_v + binary: assets/act_f36_kaeru_b_v.bin + header: assets/act_f36_kaeru_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f36_kaeru_c_v + binary: assets/act_f36_kaeru_c_v.bin + header: assets/act_f36_kaeru_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_gyoei02_0_int_i4 + binary: assets/act_gyoei02_0_int_i4.bin + header: assets/act_gyoei02_0_int_i4.inc + header_type: raw + + - symbol: act_gyoei02_1_int_i4 + binary: assets/act_gyoei02_1_int_i4.bin + header: assets/act_gyoei02_1_int_i4.inc + header_type: raw + + - symbol: act_gyoei02_2_int_i4 + binary: assets/act_gyoei02_2_int_i4.bin + header: assets/act_gyoei02_2_int_i4.inc + header_type: raw + + - symbol: act_gyoei02_3_int_i4 + binary: assets/act_gyoei02_3_int_i4.bin + header: assets/act_gyoei02_3_int_i4.inc + header_type: raw + + - symbol: act_gyoei02_00_v + binary: assets/act_gyoei02_00_v.bin + header: assets/act_gyoei02_00_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f32_kaseki_pal + binary: assets/act_f32_kaseki_pal.bin + header: assets/act_f32_kaseki_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f32_kaseki_tex + binary: assets/act_f32_kaseki_tex.bin + header: assets/act_f32_kaseki_tex.inc + header_type: raw + + - symbol: act_f32_kaseki_a_v + binary: assets/act_f32_kaseki_a_v.bin + header: assets/act_f32_kaseki_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f32_kaseki_b_v + binary: assets/act_f32_kaseki_b_v.bin + header: assets/act_f32_kaseki_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f32_kaseki_c_v + binary: assets/act_f32_kaseki_c_v.bin + header: assets/act_f32_kaseki_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f24_kingyo_pal + binary: assets/act_f24_kingyo_pal.bin + header: assets/act_f24_kingyo_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f24_kingyo_tex + binary: assets/act_f24_kingyo_tex.bin + header: assets/act_f24_kingyo_tex.inc + header_type: raw + + - symbol: act_f24_kingyo_a_v + binary: assets/act_f24_kingyo_a_v.bin + header: assets/act_f24_kingyo_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f24_kingyo_b_v + binary: assets/act_f24_kingyo_b_v.bin + header: assets/act_f24_kingyo_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f24_kingyo_c_v + binary: assets/act_f24_kingyo_c_v.bin + header: assets/act_f24_kingyo_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f03_koi_pal + binary: assets/act_f03_koi_pal.bin + header: assets/act_f03_koi_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f03_koi_tex + binary: assets/act_f03_koi_tex.bin + header: assets/act_f03_koi_tex.inc + header_type: raw + + - symbol: act_f03_koi_a_v + binary: assets/act_f03_koi_a_v.bin + header: assets/act_f03_koi_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f03_koi_b_v + binary: assets/act_f03_koi_b_v.bin + header: assets/act_f03_koi_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f03_koi_c_v + binary: assets/act_f03_koi_c_v.bin + header: assets/act_f03_koi_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f37_kurage_pal!.data:0x23f3c0 + binary: assets/act_f37_kurage/act_f37_kurage_pal.bin + header: assets/act_f37_kurage/act_f37_kurage_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f37_kurage_head_tex + binary: assets/act_f37_kurage_head_tex.bin + header: assets/act_f37_kurage_head_tex.inc + header_type: raw + + - symbol: act_f37_kurage_foot_tex + binary: assets/act_f37_kurage_foot_tex.bin + header: assets/act_f37_kurage_foot_tex.inc + header_type: raw + + - symbol: act_f37_kurage_a_v + binary: assets/act_f37_kurage_a_v.bin + header: assets/act_f37_kurage_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f37_kurage_b_v + binary: assets/act_f37_kurage_b_v.bin + header: assets/act_f37_kurage_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f37_kurage_c_v + binary: assets/act_f37_kurage_c_v.bin + header: assets/act_f37_kurage_c_v.inc + header_type: none + custom_type: vtx + + - symbol: int_nog_medaka_pal!.data:0x23f9e0 + binary: assets/act_f33_medaka/int_nog_medaka_pal.bin + header: assets/act_f33_medaka/int_nog_medaka_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f33_medaka_tex + binary: assets/act_f33_medaka_tex.bin + header: assets/act_f33_medaka_tex.inc + header_type: raw + + - symbol: act_f33_medaka_a_v + binary: assets/act_f33_medaka_a_v.bin + header: assets/act_f33_medaka_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f33_medaka_b_v + binary: assets/act_f33_medaka_b_v.bin + header: assets/act_f33_medaka_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f33_medaka_c_v + binary: assets/act_f33_medaka_c_v.bin + header: assets/act_f33_medaka_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f30_nagagutu_pal + binary: assets/act_f30_nagagutu_pal.bin + header: assets/act_f30_nagagutu_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f30_nagagutu_tex + binary: assets/act_f30_nagagutu_tex.bin + header: assets/act_f30_nagagutu_tex.inc + header_type: raw + + - symbol: act_f30_nagagutu_v + binary: assets/act_f30_nagagutu_v.bin + header: assets/act_f30_nagagutu_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f05_namazu_pal + binary: assets/act_f05_namazu_pal.bin + header: assets/act_f05_namazu_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f05_namazu_tex + binary: assets/act_f05_namazu_tex.bin + header: assets/act_f05_namazu_tex.inc + header_type: raw + + - symbol: act_f05_namazu_a_v + binary: assets/act_f05_namazu_a_v.bin + header: assets/act_f05_namazu_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f05_namazu_b_v + binary: assets/act_f05_namazu_b_v.bin + header: assets/act_f05_namazu_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f05_namazu_c_v + binary: assets/act_f05_namazu_c_v.bin + header: assets/act_f05_namazu_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f12_nigoi_pal + binary: assets/act_f12_nigoi_pal.bin + header: assets/act_f12_nigoi_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f12_nigoi_tex + binary: assets/act_f12_nigoi_tex.bin + header: assets/act_f12_nigoi_tex.inc + header_type: raw + + - symbol: act_f12_nigoi_a_v + binary: assets/act_f12_nigoi_a_v.bin + header: assets/act_f12_nigoi_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f12_nigoi_b_v + binary: assets/act_f12_nigoi_b_v.bin + header: assets/act_f12_nigoi_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f12_nigoi_c_v + binary: assets/act_f12_nigoi_c_v.bin + header: assets/act_f12_nigoi_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f21_niji_pal + binary: assets/act_f21_niji_pal.bin + header: assets/act_f21_niji_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f21_niji_tex + binary: assets/act_f21_niji_tex.bin + header: assets/act_f21_niji_tex.inc + header_type: raw + + - symbol: act_f21_niji_a_v + binary: assets/act_f21_niji_a_v.bin + header: assets/act_f21_niji_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f21_niji_b_v + binary: assets/act_f21_niji_b_v.bin + header: assets/act_f21_niji_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f21_niji_c_v + binary: assets/act_f21_niji_c_v.bin + header: assets/act_f21_niji_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f04_nisiki_pal + binary: assets/act_f04_nisiki_pal.bin + header: assets/act_f04_nisiki_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f04_nisiki_tex + binary: assets/act_f04_nisiki_tex.bin + header: assets/act_f04_nisiki_tex.inc + header_type: raw + + - symbol: act_f04_nisiki_a_v + binary: assets/act_f04_nisiki_a_v.bin + header: assets/act_f04_nisiki_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f04_nisiki_b_v + binary: assets/act_f04_nisiki_b_v.bin + header: assets/act_f04_nisiki_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f04_nisiki_c_v + binary: assets/act_f04_nisiki_c_v.bin + header: assets/act_f04_nisiki_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f14_oikawa_pal + binary: assets/act_f14_oikawa_pal.bin + header: assets/act_f14_oikawa_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f14_oikawa_tex + binary: assets/act_f14_oikawa_tex.bin + header: assets/act_f14_oikawa_tex.inc + header_type: raw + + - symbol: act_f14_oikawa_a_v + binary: assets/act_f14_oikawa_a_v.bin + header: assets/act_f14_oikawa_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f14_oikawa_b_v + binary: assets/act_f14_oikawa_b_v.bin + header: assets/act_f14_oikawa_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f14_oikawa_c_v + binary: assets/act_f14_oikawa_c_v.bin + header: assets/act_f14_oikawa_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f20_iwana_pal + binary: assets/act_f20_iwana_pal.bin + header: assets/act_f20_iwana_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f20_iwana_tex + binary: assets/act_f20_iwana_tex.bin + header: assets/act_f20_iwana_tex.inc + header_type: raw + + - symbol: act_f20_iwana_a_v + binary: assets/act_f20_iwana_a_v.bin + header: assets/act_f20_iwana_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f20_iwana_b_v + binary: assets/act_f20_iwana_b_v.bin + header: assets/act_f20_iwana_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f20_iwana_c_v + binary: assets/act_f20_iwana_c_v.bin + header: assets/act_f20_iwana_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f10_oonamazu_pal + binary: assets/act_f10_oonamazu_pal.bin + header: assets/act_f10_oonamazu_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f10_oonamazu_tex + binary: assets/act_f10_oonamazu_tex.bin + header: assets/act_f10_oonamazu_tex.inc + header_type: raw + + - symbol: act_f10_oonamazu_a_v + binary: assets/act_f10_oonamazu_a_v.bin + header: assets/act_f10_oonamazu_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f10_oonamazu_b_v + binary: assets/act_f10_oonamazu_b_v.bin + header: assets/act_f10_oonamazu_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f10_oonamazu_c_v + binary: assets/act_f10_oonamazu_c_v.bin + header: assets/act_f10_oonamazu_c_v.inc + header_type: none + custom_type: vtx + + - symbol: int_nog_piraluku_pal!.data:0x242bc0 + binary: assets/act_f34_piraluku/int_nog_piraluku_pal.bin + header: assets/act_f34_piraluku/int_nog_piraluku_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f34_piraluku_tex + binary: assets/act_f34_piraluku_tex.bin + header: assets/act_f34_piraluku_tex.inc + header_type: raw + + - symbol: act_f34_piraluku_a_v + binary: assets/act_f34_piraluku_a_v.bin + header: assets/act_f34_piraluku_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f34_piraluku_b_v + binary: assets/act_f34_piraluku_b_v.bin + header: assets/act_f34_piraluku_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f34_piraluku_c_v + binary: assets/act_f34_piraluku_c_v.bin + header: assets/act_f34_piraluku_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f25_pirania_pal + binary: assets/act_f25_pirania_pal.bin + header: assets/act_f25_pirania_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f25_pirania_tex + binary: assets/act_f25_pirania_tex.bin + header: assets/act_f25_pirania_tex.inc + header_type: raw + + - symbol: act_f25_pirania_a_v + binary: assets/act_f25_pirania_a_v.bin + header: assets/act_f25_pirania_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f25_pirania_b_v + binary: assets/act_f25_pirania_b_v.bin + header: assets/act_f25_pirania_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f25_pirania_c_v + binary: assets/act_f25_pirania_c_v.bin + header: assets/act_f25_pirania_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f11_raigyo_pal + binary: assets/act_f11_raigyo_pal.bin + header: assets/act_f11_raigyo_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f11_raigyo_tex + binary: assets/act_f11_raigyo_tex.bin + header: assets/act_f11_raigyo_tex.inc + header_type: raw + + - symbol: act_f11_raigyo_a_v + binary: assets/act_f11_raigyo_a_v.bin + header: assets/act_f11_raigyo_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f11_raigyo_b_v + binary: assets/act_f11_raigyo_b_v.bin + header: assets/act_f11_raigyo_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f11_raigyo_c_v + binary: assets/act_f11_raigyo_c_v.bin + header: assets/act_f11_raigyo_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f23_sake_pal + binary: assets/act_f23_sake_pal.bin + header: assets/act_f23_sake_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f23_sake_tex + binary: assets/act_f23_sake_tex.bin + header: assets/act_f23_sake_tex.inc + header_type: raw + + - symbol: act_f23_sake_a_v + binary: assets/act_f23_sake_a_v.bin + header: assets/act_f23_sake_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f23_sake_b_v + binary: assets/act_f23_sake_b_v.bin + header: assets/act_f23_sake_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f23_sake_c_v + binary: assets/act_f23_sake_c_v.bin + header: assets/act_f23_sake_c_v.inc + header_type: none + custom_type: vtx + + - symbol: int_nog_suzuki_pal!.data:0x244560 + binary: assets/act_f38_suzuki/int_nog_suzuki_pal.bin + header: assets/act_f38_suzuki/int_nog_suzuki_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f38_suzuki_tex + binary: assets/act_f38_suzuki_tex.bin + header: assets/act_f38_suzuki_tex.inc + header_type: raw + + - symbol: act_f38_suzuki_a_v + binary: assets/act_f38_suzuki_a_v.bin + header: assets/act_f38_suzuki_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f38_suzuki_b_v + binary: assets/act_f38_suzuki_b_v.bin + header: assets/act_f38_suzuki_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f38_suzuki_c_v + binary: assets/act_f38_suzuki_c_v.bin + header: assets/act_f38_suzuki_c_v.inc + header_type: none + custom_type: vtx + + - symbol: int_nog_tai_pal!.data:0x244b80 + binary: assets/act_f39_tai/int_nog_tai_pal.bin + header: assets/act_f39_tai/int_nog_tai_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f39_tai_tex + binary: assets/act_f39_tai_tex.bin + header: assets/act_f39_tai_tex.inc + header_type: raw + + - symbol: act_f39_tai_a_v + binary: assets/act_f39_tai_a_v.bin + header: assets/act_f39_tai_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f39_tai_b_v + binary: assets/act_f39_tai_b_v.bin + header: assets/act_f39_tai_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f39_tai_c_v + binary: assets/act_f39_tai_c_v.bin + header: assets/act_f39_tai_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f31_taiya_pal + binary: assets/act_f31_taiya_pal.bin + header: assets/act_f31_taiya_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f31_taiya_tex + binary: assets/act_f31_taiya_tex.bin + header: assets/act_f31_taiya_tex.inc + header_type: raw + + - symbol: act_f31_taiya_v + binary: assets/act_f31_taiya_v.bin + header: assets/act_f31_taiya_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f15_tanago_pal + binary: assets/act_f15_tanago_pal.bin + header: assets/act_f15_tanago_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f15_tanago_tex + binary: assets/act_f15_tanago_tex.bin + header: assets/act_f15_tanago_tex.inc + header_type: raw + + - symbol: act_f15_tanago_a_v + binary: assets/act_f15_tanago_a_v.bin + header: assets/act_f15_tanago_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f15_tanago_b_v + binary: assets/act_f15_tanago_b_v.bin + header: assets/act_f15_tanago_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f15_tanago_c_v + binary: assets/act_f15_tanago_c_v.bin + header: assets/act_f15_tanago_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f13_ugui_pal + binary: assets/act_f13_ugui_pal.bin + header: assets/act_f13_ugui_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f13_ugui_tex + binary: assets/act_f13_ugui_tex.bin + header: assets/act_f13_ugui_tex.inc + header_type: raw + + - symbol: act_f13_ugui_a_v + binary: assets/act_f13_ugui_a_v.bin + header: assets/act_f13_ugui_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f13_ugui_b_v + binary: assets/act_f13_ugui_b_v.bin + header: assets/act_f13_ugui_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f13_ugui_c_v + binary: assets/act_f13_ugui_c_v.bin + header: assets/act_f13_ugui_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f27_unagi_pal + binary: assets/act_f27_unagi_pal.bin + header: assets/act_f27_unagi_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f27_unagi_tex + binary: assets/act_f27_unagi_tex.bin + header: assets/act_f27_unagi_tex.inc + header_type: raw + + - symbol: act_f27_unagi_a_v + binary: assets/act_f27_unagi_a_v.bin + header: assets/act_f27_unagi_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f27_unagi_b_v + binary: assets/act_f27_unagi_b_v.bin + header: assets/act_f27_unagi_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f27_unagi_c_v + binary: assets/act_f27_unagi_c_v.bin + header: assets/act_f27_unagi_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f17_wakasagi_pal + binary: assets/act_f17_wakasagi_pal.bin + header: assets/act_f17_wakasagi_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f17_wakasagi_tex + binary: assets/act_f17_wakasagi_tex.bin + header: assets/act_f17_wakasagi_tex.inc + header_type: raw + + - symbol: act_f17_wakasagi_a_v + binary: assets/act_f17_wakasagi_a_v.bin + header: assets/act_f17_wakasagi_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f17_wakasagi_b_v + binary: assets/act_f17_wakasagi_b_v.bin + header: assets/act_f17_wakasagi_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f17_wakasagi_c_v + binary: assets/act_f17_wakasagi_c_v.bin + header: assets/act_f17_wakasagi_c_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f19_yamame_pal + binary: assets/act_f19_yamame_pal.bin + header: assets/act_f19_yamame_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f19_yamame_tex + binary: assets/act_f19_yamame_tex.bin + header: assets/act_f19_yamame_tex.inc + header_type: raw + + - symbol: act_f19_yamame_a_v + binary: assets/act_f19_yamame_a_v.bin + header: assets/act_f19_yamame_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f19_yamame_b_v + binary: assets/act_f19_yamame_b_v.bin + header: assets/act_f19_yamame_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f19_yamame_c_v + binary: assets/act_f19_yamame_c_v.bin + header: assets/act_f19_yamame_c_v.inc + header_type: none + custom_type: vtx + + - symbol: int_nog_zarigani_pal!.data:0x247020 + binary: assets/act_f35_zarigani/int_nog_zarigani_pal.bin + header: assets/act_f35_zarigani/int_nog_zarigani_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_f35_zarigani_tex + binary: assets/act_f35_zarigani_tex.bin + header: assets/act_f35_zarigani_tex.inc + header_type: raw + + - symbol: act_f35_zarigani_a_v + binary: assets/act_f35_zarigani_a_v.bin + header: assets/act_f35_zarigani_a_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f35_zarigani_b_v + binary: assets/act_f35_zarigani_b_v.bin + header: assets/act_f35_zarigani_b_v.inc + header_type: none + custom_type: vtx + + - symbol: act_f35_zarigani_c_v + binary: assets/act_f35_zarigani_c_v.bin + header: assets/act_f35_zarigani_c_v.inc + header_type: none + custom_type: vtx + + - symbol: rom_myhome_ug_pal + binary: assets/rom_myhome_ug_pal.bin + header: assets/rom_myhome_ug_pal.inc + header_type: none + custom_type: pal16 + + - symbol: rom_myhome_pal!.data:0x2c1a60 + binary: assets/rom_myhome_ug/rom_myhome_pal.bin + header: assets/rom_myhome_ug/rom_myhome_pal.inc + header_type: none + custom_type: pal16 + + - symbol: rom_myhome_ugf1_tex + binary: assets/rom_myhome_ugf1_tex.bin + header: assets/rom_myhome_ugf1_tex.inc + header_type: raw + + - symbol: rom_myhome_enter2_tex!.data:0x2c2280 + binary: assets/rom_myhome_ug/rom_myhome_enter2_tex.bin + header: assets/rom_myhome_ug/rom_myhome_enter2_tex.inc + header_type: raw + + - symbol: rom_myhome_ugw1_tex + binary: assets/rom_myhome_ugw1_tex.bin + header: assets/rom_myhome_ugw1_tex.inc + header_type: raw + + - symbol: rom_myhome_ugw2_tex + binary: assets/rom_myhome_ugw2_tex.bin + header: assets/rom_myhome_ugw2_tex.inc + header_type: raw + + - symbol: rom_myhome_ug_v + binary: assets/rom_myhome_ug_v.bin + header: assets/rom_myhome_ug_v.inc + header_type: none + custom_type: vtx + + - symbol: hnw_v + binary: assets/hnw_v.bin + header: assets/hnw_v.inc + header_type: none + custom_type: vtx + + - symbol: hnw_face + binary: assets/hnw_face.bin + header: assets/hnw_face.inc + header_type: none + custom_type: pal16 + + - symbol: hnw_tmem_txt + binary: assets/hnw_tmem_txt.bin + header: assets/hnw_tmem_txt.inc + header_type: raw + + - symbol: act_m_house_goki_pal + binary: assets/act_m_house_goki_pal.bin + header: assets/act_m_house_goki_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_house_goki + binary: assets/act_m_house_goki.bin + header: assets/act_m_house_goki.inc + header_type: raw + + - symbol: act_m_house_goki_v + binary: assets/act_m_house_goki_v.bin + header: assets/act_m_house_goki_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_abura_pal!.data:0x2620c0 + binary: assets/act_m_abura/act_m_abura_pal.bin + header: assets/act_m_abura/act_m_abura_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_abura!.data:0x2620e0 + binary: assets/act_m_abura/act_m_abura.bin + header: assets/act_m_abura/act_m_abura.inc + header_type: raw + + - symbol: act_m_abura_v!.data:0x2622e0 + binary: assets/act_m_abura/act_m_abura_v.bin + header: assets/act_m_abura/act_m_abura_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_akiakane_pal!.data:0x262560 + binary: assets/act_m_akiakane/act_m_akiakane_pal.bin + header: assets/act_m_akiakane/act_m_akiakane_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_akiakane!.data:0x262580 + binary: assets/act_m_akiakane/act_m_akiakane.bin + header: assets/act_m_akiakane/act_m_akiakane.inc + header_type: raw + + - symbol: act_m_akiakane_v!.data:0x262700 + binary: assets/act_m_akiakane/act_m_akiakane_v.bin + header: assets/act_m_akiakane/act_m_akiakane_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_amenbo_pal!.data:0x262940 + binary: assets/act_m_amenbo/act_m_amenbo_pal.bin + header: assets/act_m_amenbo/act_m_amenbo_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_amenbo_tex!.data:0x262960 + binary: assets/act_m_amenbo/act_m_amenbo_tex.bin + header: assets/act_m_amenbo/act_m_amenbo_tex.inc + header_type: raw + + - symbol: act_m_amenbo_v!.data:0x262ae0 + binary: assets/act_m_amenbo/act_m_amenbo_v.bin + header: assets/act_m_amenbo/act_m_amenbo_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_ari_pal!.data:0x262c80 + binary: assets/act_m_ari/act_m_ari_pal.bin + header: assets/act_m_ari/act_m_ari_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_ari_tex!.data:0x262ca0 + binary: assets/act_m_ari/act_m_ari_tex.bin + header: assets/act_m_ari/act_m_ari_tex.inc + header_type: raw + + - symbol: act_m_ari_v!.data:0x262da0 + binary: assets/act_m_ari/act_m_ari_v.bin + header: assets/act_m_ari/act_m_ari_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_dango_pal!.data:0x262e60 + binary: assets/act_m_dango/act_m_dango_pal.bin + header: assets/act_m_dango/act_m_dango_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_dango_tex!.data:0x262e80 + binary: assets/act_m_dango/act_m_dango_tex.bin + header: assets/act_m_dango/act_m_dango_tex.inc + header_type: raw + + - symbol: act_m_dango_v!.data:0x263000 + binary: assets/act_m_dango/act_m_dango_v.bin + header: assets/act_m_dango/act_m_dango_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_danna_pal!.data:0x263180 + binary: assets/act_m_danna/act_m_danna_pal.bin + header: assets/act_m_danna/act_m_danna_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_danna!.data:0x2631a0 + binary: assets/act_m_danna/act_m_danna.bin + header: assets/act_m_danna/act_m_danna.inc + header_type: raw + + - symbol: act_m_danna_v!.data:0x2633a0 + binary: assets/act_m_danna/act_m_danna_v.bin + header: assets/act_m_danna/act_m_danna_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_genji_h1_txt!.data:0x263520 + binary: assets/act_m_genji2/act_m_genji_h1_txt.bin + header: assets/act_m_genji2/act_m_genji_h1_txt.inc + header_type: raw + + - symbol: act_m_genji2_v!.data:0x263720 + binary: assets/act_m_genji2/act_m_genji2_v.bin + header: assets/act_m_genji2/act_m_genji2_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_ginyanma_pal!.data:0x263980 + binary: assets/act_m_ginyanma/act_m_ginyanma_pal.bin + header: assets/act_m_ginyanma/act_m_ginyanma_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_ginyanma!.data:0x2639a0 + binary: assets/act_m_ginyanma/act_m_ginyanma.bin + header: assets/act_m_ginyanma/act_m_ginyanma.inc + header_type: raw + + - symbol: act_m_ginyanma_v!.data:0x263b20 + binary: assets/act_m_ginyanma/act_m_ginyanma_v.bin + header: assets/act_m_ginyanma/act_m_ginyanma_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_gomadara_pal!.data:0x263d60 + binary: assets/act_m_gomadara/act_m_gomadara_pal.bin + header: assets/act_m_gomadara/act_m_gomadara_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_gomadara!.data:0x263d80 + binary: assets/act_m_gomadara/act_m_gomadara.bin + header: assets/act_m_gomadara/act_m_gomadara.inc + header_type: raw + + - symbol: act_m_gomadara_v!.data:0x263f80 + binary: assets/act_m_gomadara/act_m_gomadara_v.bin + header: assets/act_m_gomadara/act_m_gomadara_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_higurashi_pal!.data:0x264100 + binary: assets/act_m_higurashi/act_m_higurashi_pal.bin + header: assets/act_m_higurashi/act_m_higurashi_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_higurashi!.data:0x264120 + binary: assets/act_m_higurashi/act_m_higurashi.bin + header: assets/act_m_higurashi/act_m_higurashi.inc + header_type: raw + + - symbol: act_m_higurashi_v!.data:0x264320 + binary: assets/act_m_higurashi/act_m_higurashi_v.bin + header: assets/act_m_higurashi/act_m_higurashi_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_hirata_pal!.data:0x2645a0 + binary: assets/act_m_hirata/act_m_hirata_pal.bin + header: assets/act_m_hirata/act_m_hirata_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_hirata!.data:0x2645c0 + binary: assets/act_m_hirata/act_m_hirata.bin + header: assets/act_m_hirata/act_m_hirata.inc + header_type: raw + + - symbol: act_m_hirata_v!.data:0x2647c0 + binary: assets/act_m_hirata/act_m_hirata_v.bin + header: assets/act_m_hirata/act_m_hirata_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_hitodama_h2_txt + binary: assets/act_m_hitodama_h2_txt.bin + header: assets/act_m_hitodama_h2_txt.inc + header_type: raw + + - symbol: act_m_hitodama_h1_txt + binary: assets/act_m_hitodama_h1_txt.bin + header: assets/act_m_hitodama_h1_txt.inc + header_type: raw + + - symbol: act_m_hitodama_v + binary: assets/act_m_hitodama_v.bin + header: assets/act_m_hitodama_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_ka_pal!.data:0x264e60 + binary: assets/act_m_ka/act_m_ka_pal.bin + header: assets/act_m_ka/act_m_ka_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_ka_tex!.data:0x264e80 + binary: assets/act_m_ka/act_m_ka_tex.bin + header: assets/act_m_ka/act_m_ka_tex.inc + header_type: raw + + - symbol: act_m_ka_v!.data:0x265000 + binary: assets/act_m_ka/act_m_ka_v.bin + header: assets/act_m_ka/act_m_ka_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_kabuto_pal!.data:0x2652a0 + binary: assets/act_m_kabuto/act_m_kabuto_pal.bin + header: assets/act_m_kabuto/act_m_kabuto_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_kabuto!.data:0x2652c0 + binary: assets/act_m_kabuto/act_m_kabuto.bin + header: assets/act_m_kabuto/act_m_kabuto.inc + header_type: raw + + - symbol: act_m_kabuto_v!.data:0x2654c0 + binary: assets/act_m_kabuto/act_m_kabuto_v.bin + header: assets/act_m_kabuto/act_m_kabuto_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_kamakiri_pal!.data:0x265660 + binary: assets/act_m_kamakiri/act_m_kamakiri_pal.bin + header: assets/act_m_kamakiri/act_m_kamakiri_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_kamakiri!.data:0x265680 + binary: assets/act_m_kamakiri/act_m_kamakiri.bin + header: assets/act_m_kamakiri/act_m_kamakiri.inc + header_type: raw + + - symbol: act_m_kamakiri_v!.data:0x265880 + binary: assets/act_m_kamakiri/act_m_kamakiri_v.bin + header: assets/act_m_kamakiri/act_m_kamakiri_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_kanabun_pal!.data:0x265a60 + binary: assets/act_m_kanabun/act_m_kanabun_pal.bin + header: assets/act_m_kanabun/act_m_kanabun_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_kanabun!.data:0x265a80 + binary: assets/act_m_kanabun/act_m_kanabun.bin + header: assets/act_m_kanabun/act_m_kanabun.inc + header_type: raw + + - symbol: act_m_kanabun_v!.data:0x265c80 + binary: assets/act_m_kanabun/act_m_kanabun_v.bin + header: assets/act_m_kanabun/act_m_kanabun_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_kera_pal!.data:0x265e00 + binary: assets/act_m_kera/act_m_kera_pal.bin + header: assets/act_m_kera/act_m_kera_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_kera_tex!.data:0x265e20 + binary: assets/act_m_kera/act_m_kera_tex.bin + header: assets/act_m_kera/act_m_kera_tex.inc + header_type: raw + + - symbol: act_m_kera_v!.data:0x265f20 + binary: assets/act_m_kera/act_m_kera_v.bin + header: assets/act_m_kera/act_m_kera_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_kiageha_pal!.data:0x265fe0 + binary: assets/act_m_kiageha/act_m_kiageha_pal.bin + header: assets/act_m_kiageha/act_m_kiageha_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_kiageha!.data:0x266000 + binary: assets/act_m_kiageha/act_m_kiageha.bin + header: assets/act_m_kiageha/act_m_kiageha.inc + header_type: raw + + - symbol: act_m_kiageha_v!.data:0x266200 + binary: assets/act_m_kiageha/act_m_kiageha_v.bin + header: assets/act_m_kiageha/act_m_kiageha_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_kirigirisu_pal!.data:0x266380 + binary: assets/act_m_kirigirisu/act_m_kirigirisu_pal.bin + header: assets/act_m_kirigirisu/act_m_kirigirisu_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_kirigirisu!.data:0x2663a0 + binary: assets/act_m_kirigirisu/act_m_kirigirisu.bin + header: assets/act_m_kirigirisu/act_m_kirigirisu.inc + header_type: raw + + - symbol: act_m_kirigirisu_v!.data:0x2665a0 + binary: assets/act_m_kirigirisu/act_m_kirigirisu_v.bin + header: assets/act_m_kirigirisu/act_m_kirigirisu_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_koorogi_pal!.data:0x2667a0 + binary: assets/act_m_koorogi/act_m_koorogi_pal.bin + header: assets/act_m_koorogi/act_m_koorogi_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_koorogi!.data:0x2667c0 + binary: assets/act_m_koorogi/act_m_koorogi.bin + header: assets/act_m_koorogi/act_m_koorogi.inc + header_type: raw + + - symbol: act_m_koorogi_v!.data:0x266940 + binary: assets/act_m_koorogi/act_m_koorogi_v.bin + header: assets/act_m_koorogi/act_m_koorogi_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_hachi_pal!.data:0x266a40 + binary: assets/act_m_hachi/act_m_hachi_pal.bin + header: assets/act_m_hachi/act_m_hachi_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_hachi!.data:0x266a60 + binary: assets/act_m_hachi/act_m_hachi.bin + header: assets/act_m_hachi/act_m_hachi.inc + header_type: raw + + - symbol: act_m_hachi_v!.data:0x266c60 + binary: assets/act_m_hachi/act_m_hachi_v.bin + header: assets/act_m_hachi/act_m_hachi_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_kumo_pal!.data:0x266ee0 + binary: assets/act_m_kumo/act_m_kumo_pal.bin + header: assets/act_m_kumo/act_m_kumo_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_kumo_tex!.data:0x266f00 + binary: assets/act_m_kumo/act_m_kumo_tex.bin + header: assets/act_m_kumo/act_m_kumo_tex.inc + header_type: raw + + - symbol: act_m_kumo_v!.data:0x267080 + binary: assets/act_m_kumo/act_m_kumo_v.bin + header: assets/act_m_kumo/act_m_kumo_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_maimai_pal!.data:0x2672a0 + binary: assets/act_m_maimai/act_m_maimai_pal.bin + header: assets/act_m_maimai/act_m_maimai_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_maimai_tex!.data:0x2672c0 + binary: assets/act_m_maimai/act_m_maimai_tex.bin + header: assets/act_m_maimai/act_m_maimai_tex.inc + header_type: raw + + - symbol: act_m_maimai_v!.data:0x2674c0 + binary: assets/act_m_maimai/act_m_maimai_v.bin + header: assets/act_m_maimai/act_m_maimai_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_matumushi_pal!.data:0x267640 + binary: assets/act_m_matmushi/act_m_matumushi_pal.bin + header: assets/act_m_matmushi/act_m_matumushi_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_matumushi!.data:0x267660 + binary: assets/act_m_matmushi/act_m_matumushi.bin + header: assets/act_m_matmushi/act_m_matumushi.inc + header_type: raw + + - symbol: act_m_matumushi_v!.data:0x2677e0 + binary: assets/act_m_matmushi/act_m_matumushi_v.bin + header: assets/act_m_matmushi/act_m_matumushi_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_minmin_pal!.data:0x2678e0 + binary: assets/act_m_minmin/act_m_minmin_pal.bin + header: assets/act_m_minmin/act_m_minmin_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_minmin!.data:0x267900 + binary: assets/act_m_minmin/act_m_minmin.bin + header: assets/act_m_minmin/act_m_minmin.inc + header_type: raw + + - symbol: act_m_minmin_v!.data:0x267b00 + binary: assets/act_m_minmin/act_m_minmin_v.bin + header: assets/act_m_minmin/act_m_minmin_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_mino_pal!.data:0x267d80 + binary: assets/act_m_mino/act_m_mino_pal.bin + header: assets/act_m_mino/act_m_mino_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_mino_tex!.data:0x267da0 + binary: assets/act_m_mino/act_m_mino_tex.bin + header: assets/act_m_mino/act_m_mino_tex.inc + header_type: raw + + - symbol: act_m_mino_v!.data:0x267fa0 + binary: assets/act_m_mino/act_m_mino_v.bin + header: assets/act_m_mino/act_m_mino_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_miyama_pal!.data:0x268200 + binary: assets/act_m_miyama/act_m_miyama_pal.bin + header: assets/act_m_miyama/act_m_miyama_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_miyama!.data:0x268220 + binary: assets/act_m_miyama/act_m_miyama.bin + header: assets/act_m_miyama/act_m_miyama.inc + header_type: raw + + - symbol: act_m_miyama_v!.data:0x268420 + binary: assets/act_m_miyama/act_m_miyama_v.bin + header: assets/act_m_miyama/act_m_miyama_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_monki_pal!.data:0x2685A0 + binary: assets/act_m_monki/act_m_monki_pal.bin + header: assets/act_m_monki/act_m_monki_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_monki!.data:0x2685C0 + binary: assets/act_m_monki/act_m_monki.bin + header: assets/act_m_monki/act_m_monki.inc + header_type: raw + + - symbol: act_m_monki_v!.data:0x268640 + binary: assets/act_m_monki/act_m_monki_v.bin + header: assets/act_m_monki/act_m_monki_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_monshiro_pal!.data:0x2687C0 + binary: assets/act_m_monshiro/act_m_monshiro_pal.bin + header: assets/act_m_monshiro/act_m_monshiro_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_monshiro!.data:0x2687E0 + binary: assets/act_m_monshiro/act_m_monshiro.bin + header: assets/act_m_monshiro/act_m_monshiro.inc + header_type: raw + + - symbol: act_m_monshiro_v!.data:0x268860 + binary: assets/act_m_monshiro/act_m_monshiro_v.bin + header: assets/act_m_monshiro/act_m_monshiro_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_nanahoshi_pal!.data:0x2689E0 + binary: assets/act_m_nanahoshi/act_m_nanahoshi_pal.bin + header: assets/act_m_nanahoshi/act_m_nanahoshi_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_nanahoshi!.data:0x268A00 + binary: assets/act_m_nanahoshi/act_m_nanahoshi.bin + header: assets/act_m_nanahoshi/act_m_nanahoshi.inc + header_type: raw + + - symbol: act_m_nanahoshi_v!.data:0x268B00 + binary: assets/act_m_nanahoshi/act_m_nanahoshi_v.bin + header: assets/act_m_nanahoshi/act_m_nanahoshi_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_nokogiri_pal!.data:0x268DC0 + binary: assets/act_m_nokogiri/act_m_nokogiri_pal.bin + header: assets/act_m_nokogiri/act_m_nokogiri_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_nokogiri!.data:0x268DE0 + binary: assets/act_m_nokogiri/act_m_nokogiri.bin + header: assets/act_m_nokogiri/act_m_nokogiri.inc + header_type: raw + + - symbol: act_m_nokogiri_v!.data:0x268FE0 + binary: assets/act_m_nokogiri/act_m_nokogiri_v.bin + header: assets/act_m_nokogiri/act_m_nokogiri_v.inc + header_type: none + custom_type: vtx + + - symbol: act_m_ohmurasaki_pal!.data:0x269160 + binary: assets/act_m_ohmurasaki/act_m_ohmurasaki_pal.bin + header: assets/act_m_ohmurasaki/act_m_ohmurasaki_pal.inc + header_type: none + custom_type: pal16 + + - symbol: act_m_ohmurasaki!.data:0x269180 + binary: assets/act_m_ohmurasaki/act_m_ohmurasaki.bin + header: assets/act_m_ohmurasaki/act_m_ohmurasaki.inc + header_type: raw + + - symbol: act_m_ohmurasaki_v!.data:0x269380 + binary: assets/act_m_ohmurasaki/act_m_ohmurasaki_v.bin + header: assets/act_m_ohmurasaki/act_m_ohmurasaki_v.inc + header_type: none + custom_type: vtx diff --git a/config/GAFE01_00/foresta/splits.txt b/config/GAFE01_00/foresta/splits.txt index 8afba1ae..e072d648 100644 --- a/config/GAFE01_00/foresta/splits.txt +++ b/config/GAFE01_00/foresta/splits.txt @@ -4626,50 +4626,136 @@ data/npc/model/mdl/xct_1.c: data/npc/model/tex/xct_1.c: .data start:0x00236B80 end:0x00237F20 -data/dataobject/dataobject_237F20: +data/model/act_f28_akikan.c: .data start:0x00237F20 end:0x00238100 + +data/model/act_f29_angel.c: .data start:0x00238100 end:0x00238720 + +data/model/act_f26_aroana.c: .data start:0x00238720 end:0x00238D40 + +data/model/act_f18_ayu.c: .data start:0x00238D40 end:0x00239360 + +data/model/act_f08_bassl.c: .data start:0x00239360 end:0x00239980 + +data/model/act_f07_bassm.c: .data start:0x00239980 end:0x00239FA0 + +data/model/act_f06_bass.c: .data start:0x00239FA0 end:0x0023A4C0 + +data/model/act_f09_gill.c: .data start:0x0023A4C0 end:0x0023A9E0 + +data/model/act_f31_demekin.c: .data start:0x0023A9E0 end:0x0023AF00 + +data/model/act_f16_dojyo.c: .data start:0x0023AF00 end:0x0023B320 + +data/model/act_f28_donko.c: .data start:0x0023B320 end:0x0023B840 + +data/model/act_f01_funa.c: .data start:0x0023B840 end:0x0023BD60 + +data/model/act_f30_gupi.c: .data start:0x0023BD60 end:0x0023C280 + +data/model/act_f02_hera.c: .data start:0x0023C280 end:0x0023C8A0 + +data/model/act_f40_isidai.c: .data start:0x0023C8A0 end:0x0023CEC0 + +data/model/act_f22_ito.c: .data start:0x0023CEC0 end:0x0023D5E0 + +data/model/act_f36_kaeru.c: .data start:0x0023D5E0 end:0x0023DCA0 + +data/model/act_gyoei02.c: .data start:0x0023DCA0 end:0x0023E140 + +data/model/act_f32_kaseki.c: .data start:0x0023E140 end:0x0023E880 + +data/model/act_f24_kingyo.c: .data start:0x0023E880 end:0x0023EDA0 + +data/model/act_f03_koi.c: .data start:0x0023EDA0 end:0x0023F3C0 + +data/model/act_f37_kurage.c: .data start:0x0023F3C0 end:0x0023F9E0 + +data/model/act_f33_medaka.c: .data start:0x0023F9E0 end:0x0023FE00 + +data/model/act_f30_nagagutu.c: .data start:0x0023FE00 end:0x002400E0 + +data/model/act_f05_namazu.c: .data start:0x002400E0 end:0x00240700 + +data/model/act_f12_nigoi.c: .data start:0x00240700 end:0x00240D20 + +data/model/act_f21_niji.c: .data start:0x00240D20 end:0x00241340 + +data/model/act_f04_nisiki.c: .data start:0x00241340 end:0x00241960 + +data/model/act_f14_oikawa.c: .data start:0x00241960 end:0x00241E80 + +data/model/act_f20_iwana.c: .data start:0x00241E80 end:0x002424A0 + +data/model/act_f10_oonamazu.c: .data start:0x002424A0 end:0x00242BC0 + +data/model/act_f34_piraluku.c: .data start:0x00242BC0 end:0x002432E0 + +data/model/act_f25_pirania.c: .data start:0x002432E0 end:0x00243800 + +data/model/act_f11_raigyo.c: .data start:0x00243800 end:0x00243F40 + +data/model/act_f23_sake.c: .data start:0x00243F40 end:0x00244560 + +data/model/act_f38_suzuki.c: .data start:0x00244560 end:0x00244B80 + +data/model/act_f39_tai.c: .data start:0x00244B80 end:0x002451A0 + +data/model/act_f31_taiya.c: .data start:0x002451A0 end:0x00245580 + +data/model/act_f15_tanago.c: .data start:0x00245580 end:0x00245AA0 + +data/model/act_f13_ugui.c: .data start:0x00245AA0 end:0x002460C0 + +data/model/act_f27_unagi.c: .data start:0x002460C0 end:0x002465E0 + +data/model/act_f17_wakasagi.c: .data start:0x002465E0 end:0x00246A00 + +data/model/act_f19_yamame.c: .data start:0x00246A00 end:0x00247020 + +data/model/act_f35_zarigani.c: .data start:0x00247020 end:0x00247428 data/npc/model/mdl/bpt_1.c: @@ -4684,9 +4770,13 @@ data/npc/model/mdl/pkn_1.c: data/npc/model/tex/pkn_1.c: .data start:0x0024BEE0 end:0x0024C580 -data/dataobject/dataobject_24C580: +data/model/hnw_model.c: .data start:0x0024C580 end:0x0024DC50 + +data/model/hnw_move.c: .data start:0x0024DC50 end:0x0024DD60 + +data/model/hnw_face.c: .data start:0x0024DD60 end:0x0024E580 data/npc/model/mdl/hem_1.c: @@ -4746,48 +4836,130 @@ data/npc/model/tex/hrs_7.c: data/npc/model/tex/hrs_8.c: .data start:0x00260F80 end:0x00261D20 -data/dataobject/dataobject_261D20: +data/model/act_m_house_goki.c: .data start:0x00261D20 end:0x002620C0 + +data/model/act_m_abura.c: .data start:0x002620C0 end:0x00262560 + +data/model/act_m_akiakane.c: .data start:0x00262560 end:0x00262940 + +data/model/act_m_amenbo.c: .data start:0x00262940 end:0x00262C80 + +data/model/act_m_ari.c: .data start:0x00262C80 end:0x00262E60 + +data/model/act_m_dango.c: .data start:0x00262E60 end:0x00263180 + +data/model/act_m_danna.c: .data start:0x00263180 end:0x00263520 + +data/model/act_m_genji2.c: .data start:0x00263520 end:0x00263980 + +data/model/act_m_ginyanma.c: .data start:0x00263980 end:0x00263D60 + +data/model/act_m_gomadara.c: .data start:0x00263D60 end:0x00264100 + +data/model/act_m_higurashi.c: .data start:0x00264100 end:0x002645A0 + +data/model/act_m_hirata.c: .data start:0x002645A0 end:0x00264940 + +data/model/act_m_hitodama.c: .data start:0x00264940 end:0x00264E60 + +data/model/act_m_ka.c: .data start:0x00264E60 end:0x002652A0 + +data/model/act_m_kabuto.c: .data start:0x002652A0 end:0x00265660 + +data/model/act_m_kamakiri.c: .data start:0x00265660 end:0x00265A60 + +data/model/act_m_kanabun.c: .data start:0x00265A60 end:0x00265E00 + +data/model/act_m_kera.c: .data start:0x00265E00 end:0x00265FE0 + +data/model/act_m_kiageha.c: .data start:0x00265FE0 end:0x00266380 + +data/model/act_m_kirigirisu.c: .data start:0x00266380 end:0x002667A0 + +data/model/act_m_koorogi.c: .data start:0x002667A0 end:0x00266A40 + +data/model/act_m_hachi.c: .data start:0x00266A40 end:0x00266EE0 + +data/model/act_m_kumo.c: .data start:0x00266EE0 end:0x002672A0 + +data/model/act_m_maimai.c: .data start:0x002672A0 end:0x00267640 + +data/model/act_m_matmushi.c: .data start:0x00267640 end:0x002678E0 + +data/model/act_m_minmin.c: .data start:0x002678E0 end:0x00267D80 + +data/model/act_m_mino.c: .data start:0x00267D80 end:0x00268200 + +data/model/act_m_miyama.c: .data start:0x00268200 end:0x002685A0 + +data/model/act_m_monki.c: .data start:0x002685A0 end:0x002687C0 + +data/model/act_m_monshiro.c: .data start:0x002687C0 end:0x002689E0 + +data/model/act_m_nanahoshi.c: .data start:0x002689E0 end:0x00268DC0 + +data/model/act_m_nokogiri.c: .data start:0x00268DC0 end:0x00269160 + +data/model/act_m_ohmurasaki.c: .data start:0x00269160 end:0x00269500 + +data/model/act_m_okuwa.c: .data start:0x00269500 end:0x002698A0 + +data/model/act_m_oniyanma.c: .data start:0x002698A0 end:0x00269C80 + +data/model/act_m_shiokara.c: .data start:0x00269C80 end:0x0026A060 + +data/model/act_m_suzumushi.c: .data start:0x0026A060 end:0x0026A3E0 + +data/model/act_m_syouryou.c: .data start:0x0026A3E0 end:0x0026A7E0 + +data/model/act_m_tamamushi.c: .data start:0x0026A7E0 end:0x0026AB80 + +data/model/act_m_tentou.c: .data start:0x0026AB80 end:0x0026AF60 + +data/model/act_m_tonosama.c: .data start:0x0026AF60 end:0x0026B360 + +data/model/act_m_tukutuku.c: .data start:0x0026B360 end:0x0026B800 data/npc/model/mdl/plj_1.c: @@ -4865,9 +5037,13 @@ data/npc/model/tex/kal_6.c: data/scene/lighthouse.c: .data start:0x00291CA0 end:0x00291D20 -data/dataobject/dataobject_291D20: +data/model/ef_otiba.c: .data start:0x00291D20 end:0x00292080 + +data/model/obj_toudai_pole.c: .data start:0x00292080 end:0x00294260 + +data/model/obj_toudai_switch.c: .data start:0x00294260 end:0x00294510 data/npc/model/mdl/lon_1.c: @@ -4900,16 +5076,34 @@ data/scene/museum_insect.c: data/scene/museum_picture.c: .data start:0x0029B8F0 end:0x0029B9A0 -data/dataobject/dataobject_29B9A0: +data/model/obj_s_post.c: .data start:0x0029B9A0 end:0x0029B9E8 + +data/model/obj_s_post_delivery.c: .data start:0x0029B9E8 end:0x0029BAD8 + +data/model/obj_s_post_flag_off.c: .data start:0x0029BAD8 end:0x0029BB98 + +data/model/obj_s_post_flag_on.c: .data start:0x0029BB98 end:0x0029BC70 + +data/model/obj_s_post_flag_on_wait_anim.c: .data start:0x0029BC70 end:0x0029BCB0 + +data/model/obj_s_post_flag_on_wait.c: .data start:0x0029BCB0 end:0x0029BD80 + +data/model/obj_s_post_flag_model.c: .data start:0x0029BD80 end:0x0029CB00 + +data/model/obj_s_post_open.c: .data start:0x0029CB00 end:0x0029CBD0 + +data/model/obj_w_post_flag_on_wait_anim.c: .data start:0x0029CBD0 end:0x0029CC20 + +data/model/obj_w_post_model.c: .data start:0x0029CC20 end:0x0029D9A0 data/npc/model/mdl/mos_1.c: @@ -4936,8 +5130,10 @@ data/npc/model/mdl/mka_1.c: data/npc/model/tex/mka_1.c: .data start:0x002A86C0 end:0x002A8B60 -data/dataobject/dataobject_2A8B60: +data/model/obj_misin_cloth.c: .data start:0x002A8B60 end:0x002A8C00 + +data/model/obj_misin.c: .data start:0x002A8C00 end:0x002A99A8 data/npc/model/mdl/mus_1.c: @@ -4976,22 +5172,52 @@ data/npc/model/tex/mus_10.c: data/model/mural/obj_mural.c: .data start:0x002B7100 end:0x002B7200 -data/dataobject/dataobject_2B7200: +data/model/rom_myhome1_floor.c: .data start:0x002B7200 end:0x002B7B00 + +data/model/rom_myhome1_wall.c: .data start:0x002B7B00 end:0x002B8F20 + +data/model/rom_myhome2_floor.c: .data start:0x002B8F20 end:0x002B9600 + +data/model/rom_myhome2_wall.c: .data start:0x002B9600 end:0x002BA380 + +data/model/rom_myhome2B_flooar.c: .data start:0x002BA380 end:0x002BAD00 + +data/model/rom_myhome2B_wall.c: .data start:0x002BAD00 end:0x002BC180 + +data/model/rom_myhome3_floor.c: .data start:0x002BC180 end:0x002BCAC0 + +data/model/rom_myhome3_wall.c: .data start:0x002BCAC0 end:0x002BDE20 + +data/model/rom_myhome4_1_floor.c: .data start:0x002BDE20 end:0x002BE760 + +data/model/rom_myhome4_1_wall.c: .data start:0x002BE760 end:0x002BFAC0 + +data/model/rom_myhome4_2_floor.c: .data start:0x002BFAC0 end:0x002C0440 + +data/model/rom_myhome4_2_wall.c: .data start:0x002C0440 end:0x002C1A40 + +data/model/rom_myhome_ug.c: .data start:0x002C1A40 end:0x002C45D0 + +data/model/furniture_pull.c: .data start:0x002C45D0 end:0x002C4680 + +data/model/furniture_push.c: .data start:0x002C4680 end:0x002C4730 + +data/model/furniture_stop.c: .data start:0x002C4730 end:0x002C4768 data/scene/NEEDLEWORK.c: @@ -5015,250 +5241,736 @@ data/npc/model/mdl/hgs_1.c: data/npc/model/tex/hgs_1.c: .data start:0x002CA780 end:0x002CB660 -data/dataobject/dataobject_2CB660: +data/npc/npc_1_a1.c: .data start:0x002CB660 end:0x002CBAE0 + +data/npc/npc_1_a2.c: .data start:0x002CBAE0 end:0x002CBEF0 + +data/npc/npc_1_a2_r1.c: .data start:0x002CBEF0 end:0x002CC2F8 + +data/npc/npc_1_a_f1.c: .data start:0x002CC2F8 end:0x002CC6E0 + +data/npc/npc_1_a_f2.c: .data start:0x002CC6E0 end:0x002CCAD8 + +data/npc/npc_1_a_r1.c: .data start:0x002CCAD8 end:0x002CCEE0 + +data/npc/npc_1_a_r2.c: .data start:0x002CCEE0 end:0x002CD2B0 + +data/npc/npc_1_aisatu1.c: .data start:0x002CD2B0 end:0x002CD908 + +data/npc/npc_1_aisatu2.c: .data start:0x002CD908 end:0x002CDE70 + +data/npc/npc_1_aisatu3.c: .data start:0x002CDE70 end:0x002CE4A0 + +data/npc/npc_1_aisatu4.c: .data start:0x002CE4A0 end:0x002CEA50 + +data/npc/npc_1_akireru_r1.c: .data start:0x002CEA50 end:0x002CEE80 + +data/npc/npc_1_akireru_r2.c: .data start:0x002CEE80 end:0x002CEF80 + +data/npc/npc_1_aseru1.c: .data start:0x002CEF80 end:0x002CF420 + +data/npc/npc_1_aseru2.c: .data start:0x002CF420 end:0x002CFA68 + +data/npc/npc_1_aseru_f1.c: .data start:0x002CFA68 end:0x002CFF08 + +data/npc/npc_1_aseru_f2.c: .data start:0x002CFF08 end:0x002D0590 + +data/npc/npc_1_aseru_i1.c: .data start:0x002D0590 end:0x002D0A30 + +data/npc/npc_1_aseru_i2.c: .data start:0x002D0A30 end:0x002D1030 + +data/npc/npc_1_buruburu1.c: .data start:0x002D1030 end:0x002D14A0 + +data/npc/npc_1_buruburu2.c: .data start:0x002D14A0 end:0x002D19C8 + +data/npc/npc_1_contract1.c: .data start:0x002D19C8 end:0x002D1DB0 + +data/npc/npc_1_contract2.c: .data start:0x002D1DB0 end:0x002D22C0 + +data/npc/npc_1_contract3.c: .data start:0x002D22C0 end:0x002D2988 + +data/npc/npc_1_not_contract1.c: .data start:0x002D2988 end:0x002D2FA0 + +data/npc/npc_1_cracker_count1.c: .data start:0x002D2FA0 end:0x002D3400 + +data/npc/npc_1_cracker_fire1.c: .data start:0x002D3400 end:0x002D3AB8 + +data/npc/npc_1_cracker_run1.c: .data start:0x002D3AB8 end:0x002D3F98 + +data/npc/npc_1_cracker_wait1.c: .data start:0x002D3F98 end:0x002D4750 + +data/npc/npc_1_getup_seg1.c: .data start:0x002D4750 end:0x002D4DF8 + +data/npc/npc_1_getup_wait_seg1.c: .data start:0x002D4DF8 end:0x002D4EF8 + +data/npc/npc_1_piku_seg1.c: .data start:0x002D4EF8 end:0x002D54E0 + +data/npc/npc_1_delivery1.c: .data start:0x002D54E0 end:0x002D60E0 + +data/npc/npc_1_fly1.c: .data start:0x002D60E0 end:0x002D6590 + +data/npc/npc_1_flyaway1.c: .data start:0x002D6590 end:0x002D6D70 + +data/npc/npc_1_kyoro1.c: .data start:0x002D6D70 end:0x002D72C0 + +data/npc/npc_1_landing1.c: .data start:0x002D72C0 end:0x002D73C0 + +data/npc/npc_1_landing2.c: .data start:0x002D73C0 end:0x002D7878 + +data/npc/npc_1_landing3.c: .data start:0x002D7878 end:0x002D7DA0 + +data/npc/npc_1_gaaan1.c: .data start:0x002D7DA0 end:0x002D82B0 + +data/npc/npc_1_gaaan2.c: .data start:0x002D82B0 end:0x002D8690 + +data/npc/npc_1_gekido_r1.c: .data start:0x002D8690 end:0x002D8A48 + +data/npc/npc_1_gekido_r2.c: .data start:0x002D8A48 end:0x002D8FE8 + +data/npc/npc_1_estimate_f1.c: .data start:0x002D8FE8 end:0x002D9A28 + +data/npc/npc_1_get1.c: .data start:0x002D9A28 end:0x002D9DD0 + +data/npc/npc_1_get_change1.c: .data start:0x002D9DD0 end:0x002DA848 + +data/npc/npc_1_get_eat1.c: .data start:0x002DA848 end:0x002DB088 + +data/npc/npc_1_get_f1.c: .data start:0x002DB088 end:0x002DB430 + +data/npc/npc_1_get_pull1.c: .data start:0x002DB430 end:0x002DB848 + +data/npc/npc_1_get_pull_f1.c: .data start:0x002DB848 end:0x002DBC08 + +data/npc/npc_1_get_pull_wait1.c: .data start:0x002DBC08 end:0x002DC020 + +data/npc/npc_1_get_pull_wait_f1.c: .data start:0x002DC020 end:0x002DC448 + +data/npc/npc_1_get_putaway1.c: .data start:0x002DC448 end:0x002DCA70 + +data/npc/npc_1_get_putaway_f1.c: .data start:0x002DCA70 end:0x002DD0B0 + +data/npc/npc_1_get_return1.c: .data start:0x002DD0B0 end:0x002DD4C8 + +data/npc/npc_1_get_return_f1.c: .data start:0x002DD4C8 end:0x002DD888 + +data/npc/npc_1_gstwait1.c: .data start:0x002DD888 end:0x002DDC20 + +data/npc/npc_1_goukyu1.c: .data start:0x002DDC20 end:0x002DE058 + +data/npc/npc_1_goukyu2.c: .data start:0x002DE058 end:0x002DE440 + +data/npc/npc_1_ha1.c: .data start:0x002DE440 end:0x002DE8D0 + +data/npc/npc_1_ha2.c: .data start:0x002DE8D0 end:0x002DECD8 + +data/npc/npc_1_ha_e1.c: .data start:0x002DECD8 end:0x002DF100 + +data/npc/npc_1_ha_e2.c: .data start:0x002DF100 end:0x002DF4C0 + +data/npc/npc_1_ha_f1.c: .data start:0x002DF4C0 end:0x002DF8F0 + +data/npc/npc_1_ha_f2.c: .data start:0x002DF8F0 end:0x002DFD08 + +data/npc/npc_1_ha_i1.c: .data start:0x002DFD08 end:0x002E0110 + +data/npc/npc_1_ha_i2.c: .data start:0x002E0110 end:0x002E0510 + +data/npc/npc_1_banzai1.c: .data start:0x002E0510 end:0x002E0C30 + +data/npc/npc_1_clap1.c: .data start:0x002E0C30 end:0x002E1078 + +data/npc/npc_1_utiwa_wait1.c: .data start:0x002E1078 end:0x002E1230 + +data/npc/npc_1_dance1.c: .data start:0x002E1230 end:0x002E1DC8 + +data/npc/npc_1_sitdown_clap1.c: .data start:0x002E1DC8 end:0x002E23E8 + +data/npc/npc_1_sitdown_drink1.c: .data start:0x002E23E8 end:0x002E2B58 + +data/npc/npc_1_sitdown_happy1.c: .data start:0x002E2B58 end:0x002E2FB0 + +data/npc/npc_1_happy1.c: .data start:0x002E2FB0 end:0x002E3358 + +data/npc/npc_1_happy2.c: .data start:0x002E3358 end:0x002E3A00 + +data/npc/npc_1_happy_f1.c: .data start:0x002E3A00 end:0x002E3DB0 + +data/npc/npc_1_happy_f2.c: .data start:0x002E3DB0 end:0x002E4448 + +data/npc/npc_1_happy_i1.c: .data start:0x002E4448 end:0x002E47F8 + +data/npc/npc_1_happy_i2.c: .data start:0x002E47F8 end:0x002E4DE8 + +data/npc/npc_1_hate1.c: .data start:0x002E4DE8 end:0x002E51F8 + +data/npc/npc_1_hate2.c: .data start:0x002E51F8 end:0x002E55F8 + +data/npc/npc_1_hate_f1.c: .data start:0x002E55F8 end:0x002E59F0 + +data/npc/npc_1_hate_f2.c: .data start:0x002E59F0 end:0x002E5DF8 + +data/npc/npc_1_hate_i1.c: .data start:0x002E5DF8 end:0x002E61B0 + +data/npc/npc_1_hate_i2.c: .data start:0x002E61B0 end:0x002E65C8 + +data/npc/npc_1_omairi1.c: .data start:0x002E65C8 end:0x002E6A88 + +data/npc/npc_1_saisen1.c: .data start:0x002E6A88 end:0x002E72E0 + +data/npc/npc_1_hirameki1.c: .data start:0x002E72E0 end:0x002E7800 + +data/npc/npc_1_hirameki2.c: .data start:0x002E7800 end:0x002E7C48 + +data/npc/npc_1_hyuuu1.c: .data start:0x002E7C48 end:0x002E82A0 + +data/npc/npc_1_hyuuu2.c: .data start:0x002E82A0 end:0x002E83A0 + +data/npc/npc_1_hyuuu_r1.c: .data start:0x002E83A0 end:0x002E88B0 + +data/npc/npc_1_hyuuu_r2.c: .data start:0x002E88B0 end:0x002E89B0 + +data/npc/npc_1_wipkogu1.c: .data start:0x002E89B0 end:0x002E90C8 + +data/npc/npc_1_wipwait1.c: .data start:0x002E90C8 end:0x002E96C0 + +data/npc/npc_1_wipwait2.c: .data start:0x002E96C0 end:0x002E9C60 + +data/npc/npc_1_keirei1.c: .data start:0x002E9C60 end:0x002EA2C8 + +data/npc/npc_1_kieeeei1.c: .data start:0x002EA2C8 end:0x002EA858 + +data/npc/npc_1_kieeeei2.c: .data start:0x002EA858 end:0x002EAAE8 + +data/npc/npc_1_gaaan_d1.c: .data start:0x002EAAE8 end:0x002EAF58 + +data/npc/npc_1_gaaan_d2.c: .data start:0x002EAF58 end:0x002EB3A0 + +data/npc/npc_1_ha_d1.c: .data start:0x002EB3A0 end:0x002EB7C8 + +data/npc/npc_1_ha_d2.c: .data start:0x002EB7C8 end:0x002EBBD8 + +data/npc/npc_1_hate_d1.c: .data start:0x002EBBD8 end:0x002EBFD0 + +data/npc/npc_1_hate_d2.c: .data start:0x002EBFD0 end:0x002EC3B0 + +data/npc/npc_1_hirameki_d1.c: .data start:0x002EC3B0 end:0x002EC8B0 + +data/npc/npc_1_hirameki_d2.c: .data start:0x002EC8B0 end:0x002ECCE8 + +data/npc/npc_1_keitai_off1.c: .data start:0x002ECCE8 end:0x002ED370 + +data/npc/npc_1_keitai_on1.c: .data start:0x002ED370 end:0x002EDAA0 + +data/npc/npc_1_keitai_talk1.c: .data start:0x002EDAA0 end:0x002EDE90 + +data/npc/npc_1_keitai_talk2.c: .data start:0x002EDE90 end:0x002EE318 + +data/npc/npc_1_komari_d1.c: .data start:0x002EE318 end:0x002EE738 + +data/npc/npc_1_musu_d1.c: .data start:0x002EE738 end:0x002EEB58 + +data/npc/npc_1_niko_d1.c: .data start:0x002EEB58 end:0x002EEF80 + +data/npc/npc_1_open_d1.c: .data start:0x002EEF80 end:0x002EF8C0 + +data/npc/npc_1_open_d2.c: .data start:0x002EF8C0 end:0x002EFF78 + +data/npc/npc_1_sitdown_d1.c: .data start:0x002EFF78 end:0x002F09C0 + +data/npc/npc_1_sitdown_wait_d1.c: .data start:0x002F09C0 end:0x002F0E08 + +data/npc/npc_1_smile_d1.c: .data start:0x002F0E08 end:0x002F1260 + +data/npc/npc_1_smile_d2.c: .data start:0x002F1260 end:0x002F16B0 + +data/npc/npc_1_standup_d1.c: .data start:0x002F16B0 end:0x002F1D40 + +data/npc/npc_1_to_deck_d1.c: .data start:0x002F1D40 end:0x002F23B0 + +data/npc/npc_1_komari1.c: .data start:0x002F23B0 end:0x002F2830 + +data/npc/npc_1_komari_f1.c: .data start:0x002F2830 end:0x002F2C90 + +data/npc/npc_1_komari_i1.c: .data start:0x002F2C90 end:0x002F30C8 + +data/npc/npc_1_kutipaku1.c: .data start:0x002F30C8 end:0x002F3258 + +data/npc/npc_1_kutipaku2.c: .data start:0x002F3258 end:0x002F3400 + +data/npc/npc_1_love1.c: .data start:0x002F3400 end:0x002F3908 + +data/npc/npc_1_love2.c: .data start:0x002F3908 end:0x002F3D48 + +data/npc/npc_1_love_i1.c: .data start:0x002F3D48 end:0x002F4298 + +data/npc/npc_1_love_i2.c: .data start:0x002F4298 end:0x002F46B8 + +data/npc/npc_1_lovelove1.c: .data start:0x002F46B8 end:0x002F4C08 + +data/npc/npc_1_lovelove2.c: .data start:0x002F4C08 end:0x002F5350 + +data/npc/npc_1_lovelove_f1.c: .data start:0x002F5350 end:0x002F58A0 + +data/npc/npc_1_lovelove_f2.c: .data start:0x002F58A0 end:0x002F6010 + +data/npc/npc_1_appear1.c: .data start:0x002F6010 end:0x002F6650 + +data/npc/npc_1_go_ug1.c: .data start:0x002F6650 end:0x002F6C18 + +data/npc/npc_1_wait_r1.c: .data start:0x002F6C18 end:0x002F7110 + +data/npc/npc_1_matarou_r1.c: .data start:0x002F7110 end:0x002F7528 + +data/npc/npc_1_matarou_r2.c: .data start:0x002F7528 end:0x002F78A0 + +data/npc/npc_1_misin1.c: .data start:0x002F78A0 end:0x002F8030 + +data/npc/npc_1_run1.c: .data start:0x002F8030 end:0x002F8560 + +data/npc/npc_1_wait1.c: .data start:0x002F8560 end:0x002F88D0 + +data/npc/npc_1_wait_ai1.c: .data start:0x002F88D0 end:0x002F8D38 + +data/npc/npc_1_wait_do1.c: .data start:0x002F8D38 end:0x002F9560 + +data/npc/npc_1_wait_ki1.c: .data start:0x002F9560 end:0x002F9C10 + +data/npc/npc_1_wait_nemu1.c: .data start:0x002F9C10 end:0x002FA120 + +data/npc/npc_1_walk1.c: .data start:0x002FA120 end:0x002FA628 + +data/npc/npc_1_walk_ai1.c: .data start:0x002FA628 end:0x002FAB40 + +data/npc/npc_1_walk_do1.c: .data start:0x002FAB40 end:0x002FB230 + +data/npc/npc_1_walk_ki1.c: .data start:0x002FB230 end:0x002FB898 + +data/npc/npc_1_muka1.c: .data start:0x002FB898 end:0x002FBFF0 + +data/npc/npc_1_muka2.c: .data start:0x002FBFF0 end:0x002FC2E8 + +data/npc/npc_1_musu1.c: .data start:0x002FC2E8 end:0x002FC750 + +data/npc/npc_1_musu_f1.c: .data start:0x002FC750 end:0x002FCB98 + +data/npc/npc_1_musu_i1.c: .data start:0x002FCB98 end:0x002FCFF8 + +data/npc/npc_1_musu_r1.c: .data start:0x002FCFF8 end:0x002FD4F0 + +data/npc/npc_1_muuuuu1.c: .data start:0x002FD4F0 end:0x002FDA88 + +data/npc/npc_1_muuuuu2.c: .data start:0x002FDA88 end:0x002FDE90 + +data/npc/npc_1_muuuuu_f1.c: .data start:0x002FDE90 end:0x002FE3F0 + +data/npc/npc_1_muuuuu_f2.c: .data start:0x002FE3F0 end:0x002FE7F8 + +data/npc/npc_1_muuuuu_i1.c: .data start:0x002FE7F8 end:0x002FED18 + +data/npc/npc_1_muuuuu_i2.c: .data start:0x002FED18 end:0x002FF120 + +data/npc/npc_1_neboke1.c: .data start:0x002FF120 end:0x002FF770 + +data/npc/npc_1_neboke2.c: .data start:0x002FF770 end:0x002FFC48 + +data/npc/npc_1_niko1.c: .data start:0x002FFC48 end:0x00300128 + +data/npc/npc_1_niko_f1.c: .data start:0x00300128 end:0x00300628 + +data/npc/npc_1_niko_i1.c: .data start:0x00300628 end:0x00300B18 + +data/npc/npc_1_kokkuri_d1.c: .data start:0x00300B18 end:0x00300EF0 + +data/npc/npc_1_kokkuri_d2.c: .data start:0x00300EF0 end:0x00301668 + +data/npc/npc_1_go_out1.c: .data start:0x00301668 end:0x003020E0 + +data/npc/npc_1_open1.c: .data start:0x003020E0 end:0x003029E8 + +data/npc/npc_1_otikomu1.c: .data start:0x003029E8 end:0x00302FF8 + +data/npc/npc_1_otikomu2.c: .data start:0x00302FF8 end:0x00303440 + +data/npc/npc_1_deru1.c: .data start:0x00303440 end:0x00303B48 + +data/npc/npc_1_deru2.c: .data start:0x00303B48 end:0x003042F8 + +data/npc/npc_1_guratuku1.c: .data start:0x003042F8 end:0x00304A68 + +data/npc/npc_1_mogaku1.c: .data start:0x00304A68 end:0x00305248 + +data/npc/npc_1_otiru1.c: .data start:0x00305248 end:0x003056B8 + +data/npc/npc_1_otiru2.c: .data start:0x003056B8 end:0x00305B30 + +data/npc/npc_1_punpun1.c: .data start:0x00305B30 end:0x00305FD8 + +data/npc/npc_1_punpun2.c: .data start:0x00305FD8 end:0x00306408 + +data/npc/npc_1_punpun_r1.c: .data start:0x00306408 end:0x00306838 + +data/npc/npc_1_punpun_r2.c: .data start:0x00306838 end:0x00306C20 + +data/npc/npc_1_gyafun1.c: .data start:0x00306C20 end:0x003074F0 + +data/npc/npc_1_gyafun2.c: .data start:0x003074F0 end:0x00307BD8 + +data/npc/npc_1_shituren1.c: .data start:0x00307BD8 end:0x00308238 + +data/npc/npc_1_shituren2.c: .data start:0x00308238 end:0x00308338 + +data/npc/npc_1_shituren_i1.c: .data start:0x00308338 end:0x00308920 + +data/npc/npc_1_shituren_i2.c: .data start:0x00308920 end:0x00308A20 + +data/npc/npc_1_smile1.c: .data start:0x00308A20 end:0x00308FA0 + +data/npc/npc_1_smile2.c: .data start:0x00308FA0 end:0x003093C8 + +data/npc/npc_1_smile_f1.c: .data start:0x003093C8 end:0x003098F0 + +data/npc/npc_1_smile_f2.c: .data start:0x003098F0 end:0x00309DE8 + +data/npc/npc_1_intro1_a.c: .data start:0x00309DE8 end:0x0030A7B8 + +data/npc/npc_1_intro1_b.c: .data start:0x0030A7B8 end:0x0030B0D0 + +data/npc/npc_1_kiduku1.c: .data start:0x0030B0D0 end:0x0030BA18 + +data/npc/npc_1_kiduku2.c: .data start:0x0030BA18 end:0x0030C088 + +data/npc/npc_1_taisou1.c: .data start:0x0030C088 end:0x0030C7E0 + +data/npc/npc_1_taisou2.c: .data start:0x0030C7E0 end:0x0030CEB8 + +data/npc/npc_1_taisou3_a.c: .data start:0x0030CEB8 end:0x0030D9B0 + +data/npc/npc_1_taisou3_b.c: .data start:0x0030D9B0 end:0x0030E4A8 + +data/npc/npc_1_taisou4_a.c: .data start:0x0030E4A8 end:0x0030ECF8 + +data/npc/npc_1_taisou4_b.c: .data start:0x0030ECF8 end:0x0030F548 + +data/npc/npc_1_taisou5_a.c: .data start:0x0030F548 end:0x0030FF48 + +data/npc/npc_1_taisou5_b.c: .data start:0x0030FF48 end:0x00310948 + +data/npc/npc_1_taisou6_a.c: .data start:0x00310948 end:0x00311140 + +data/npc/npc_1_taisou6_b.c: .data start:0x00311140 end:0x00311930 + +data/npc/npc_1_taisou7.c: .data start:0x00311930 end:0x003122D0 + +data/npc/npc_1_tamahiroi1.c: .data start:0x003122D0 end:0x00312C40 + +data/npc/npc_1_tamanage1.c: .data start:0x00312C40 end:0x003132C8 + +data/npc/npc_1_asihumi1.c: .data start:0x003132C8 end:0x00313848 + +data/npc/npc_1_don1.c: .data start:0x00313848 end:0x00313D40 + +data/npc/npc_1_kokeru1.c: .data start:0x00313D40 end:0x00314308 + +data/npc/npc_1_kokeru_getup1.c: .data start:0x00314308 end:0x003149E8 + +data/npc/npc_1_ready1.c: .data start:0x003149E8 end:0x00314EC0 + +data/npc/npc_1_tamakome1.c: .data start:0x00314EC0 end:0x00315328 + +data/npc/npc_1_tired1.c: .data start:0x00315328 end:0x003157F8 + +data/npc/npc_1_warmup1.c: .data start:0x003157F8 end:0x003160D8 + +data/npc/npc_1_youi1.c: .data start:0x003160D8 end:0x00316518 + +data/npc/npc_1_3haku_e1.c: .data start:0x00316518 end:0x00316AF0 + +data/npc/npc_1_4haku_e1.c: .data start:0x00316AF0 end:0x00317138 + +data/npc/npc_1_ensou_e1.c: .data start:0x00317138 end:0x003178E0 + +data/npc/npc_1_wait_e1.c: .data start:0x003178E0 end:0x00317D60 + +data/npc/npc_1_send_mail1.c: .data start:0x00317D60 end:0x00318538 + +data/npc/npc_1_trans_wait1.c: .data start:0x00318538 end:0x00318950 + +data/npc/npc_1_trans_wait_f1.c: .data start:0x00318950 end:0x00318D68 + +data/npc/npc_1_transfer1.c: .data start:0x00318D68 end:0x00319690 + +data/npc/npc_1_transfer_f1.c: .data start:0x00319690 end:0x00319FC0 + +data/npc/npc_1_tue1.c: .data start:0x00319FC0 end:0x0031A348 + +data/npc/npc_1_kuisinbo1.c: .data start:0x0031A348 end:0x0031AC08 + +data/npc/npc_1_sanbasi1.c: .data start:0x0031AC08 end:0x0031B118 + +data/npc/npc_1_hatafuri1.c: .data start:0x0031B118 end:0x0031B9F8 + +data/npc/npc_1_tunahiki_aiko1.c: .data start:0x0031B9F8 end:0x0031BFA0 + +data/npc/npc_1_tunahiki_furi1.c: .data start:0x0031BFA0 end:0x0031C698 + +data/npc/npc_1_tunahiki_yuri1.c: .data start:0x0031C698 end:0x0031CCE0 + +data/npc/npc_1_turi_wait1.c: .data start:0x0031CCE0 end:0x0031D178 + +data/npc/npc_1_tkukoro1.c: .data start:0x0031D178 end:0x0031DCD8 + +data/npc/npc_1_umb_close1.c: .data start:0x0031DCD8 end:0x0031E4D0 + +data/npc/npc_1_umb_open1.c: .data start:0x0031E4D0 end:0x0031ED68 + +data/npc/npc_1_umbrella1.c: .data start:0x0031ED68 end:0x0031EE68 + +data/npc/npc_1_warudakumi1.c: .data start:0x0031EE68 end:0x0031F268 + +data/npc/npc_1_warudakumi2.c: .data start:0x0031F268 end:0x0031F890 data/npc/default_list.c: diff --git a/configure.py b/configure.py index e6901f43..b612ac62 100644 --- a/configure.py +++ b/configure.py @@ -2782,6 +2782,371 @@ config.libs = [ Object(Matching, "data/font/FONT_nes_tex_sayuu.c"), Object(Matching, "data/model/obj_garagara.c"), Object(Matching, "data/model/girl_model.c"), + Object(Matching, "data/model/act_f28_akikan.c"), + Object(Matching, "data/model/act_f29_angel.c"), + Object(Matching, "data/model/act_f26_aroana.c"), + Object(Matching, "data/model/act_f18_ayu.c"), + Object(Matching, "data/model/act_f08_bassl.c"), + Object(Matching, "data/model/act_f07_bassm.c"), + Object(Matching, "data/model/act_f06_bass.c"), + Object(Matching, "data/model/act_f09_gill.c"), + Object(Matching, "data/model/act_f31_demekin.c"), + Object(Matching, "data/model/act_f16_dojyo.c"), + Object(Matching, "data/model/act_f28_donko.c"), + Object(Matching, "data/model/act_f01_funa.c"), + Object(Matching, "data/model/act_f30_gupi.c"), + Object(Matching, "data/model/act_f02_hera.c"), + Object(Matching, "data/model/act_f40_isidai.c"), + Object(Matching, "data/model/act_f22_ito.c"), + Object(Matching, "data/model/act_f36_kaeru.c"), + Object(Matching, "data/model/act_gyoei02.c"), + Object(Matching, "data/model/act_f32_kaseki.c"), + Object(Matching, "data/model/act_f24_kingyo.c"), + Object(Matching, "data/model/act_f03_koi.c"), + Object(Matching, "data/model/act_f37_kurage.c"), + Object(Matching, "data/model/act_f33_medaka.c"), + Object(Matching, "data/model/act_f30_nagagutu.c"), + Object(Matching, "data/model/act_f05_namazu.c"), + Object(Matching, "data/model/act_f12_nigoi.c"), + Object(Matching, "data/model/act_f21_niji.c"), + Object(Matching, "data/model/act_f04_nisiki.c"), + Object(Matching, "data/model/act_f14_oikawa.c"), + Object(Matching, "data/model/act_f20_iwana.c"), + Object(Matching, "data/model/act_f10_oonamazu.c"), + Object(Matching, "data/model/act_f34_piraluku.c"), + Object(Matching, "data/model/act_f25_pirania.c"), + Object(Matching, "data/model/act_f11_raigyo.c"), + Object(Matching, "data/model/act_f23_sake.c"), + Object(Matching, "data/model/act_f38_suzuki.c"), + Object(Matching, "data/model/act_f39_tai.c"), + Object(Matching, "data/model/act_f31_taiya.c"), + Object(Matching, "data/model/act_f15_tanago.c"), + Object(Matching, "data/model/act_f13_ugui.c"), + Object(Matching, "data/model/act_f27_unagi.c"), + Object(Matching, "data/model/act_f17_wakasagi.c"), + Object(Matching, "data/model/act_f19_yamame.c"), + Object(Matching, "data/model/act_f35_zarigani.c"), + Object(Matching, "data/model/hnw_model.c"), + Object(Matching, "data/model/hnw_move.c"), + Object(Matching, "data/model/hnw_face.c"), + Object(Matching, "data/model/act_m_house_goki.c"), + Object(Matching, "data/model/act_m_abura.c"), + Object(Matching, "data/model/act_m_akiakane.c"), + Object(Matching, "data/model/act_m_amenbo.c"), + Object(Matching, "data/model/act_m_ari.c"), + Object(Matching, "data/model/act_m_dango.c"), + Object(Matching, "data/model/act_m_danna.c"), + Object(Matching, "data/model/act_m_genji2.c"), + Object(Matching, "data/model/act_m_ginyanma.c"), + Object(Matching, "data/model/act_m_gomadara.c"), + Object(Matching, "data/model/act_m_higurashi.c"), + Object(Matching, "data/model/act_m_hirata.c"), + Object(Matching, "data/model/act_m_hitodama.c"), + Object(Matching, "data/model/act_m_ka.c"), + Object(Matching, "data/model/act_m_kabuto.c"), + Object(Matching, "data/model/act_m_kamakiri.c"), + Object(Matching, "data/model/act_m_kanabun.c"), + Object(Matching, "data/model/act_m_kera.c"), + Object(Matching, "data/model/act_m_kiageha.c"), + Object(Matching, "data/model/act_m_kirigirisu.c"), + Object(Matching, "data/model/act_m_koorogi.c"), + Object(Matching, "data/model/act_m_hachi.c"), + Object(Matching, "data/model/act_m_kumo.c"), + Object(Matching, "data/model/act_m_maimai.c"), + Object(Matching, "data/model/act_m_matmushi.c"), + Object(Matching, "data/model/act_m_minmin.c"), + Object(Matching, "data/model/act_m_mino.c"), + Object(Matching, "data/model/act_m_miyama.c"), + Object(Matching, "data/model/act_m_monki.c"), + Object(Matching, "data/model/act_m_monshiro.c"), + Object(Matching, "data/model/act_m_nanahoshi.c"), + Object(Matching, "data/model/act_m_nokogiri.c"), + Object(Matching, "data/model/act_m_ohmurasaki.c"), + Object(NonMatching, "data/model/act_m_okuwa.c"), + Object(NonMatching, "data/model/act_m_oniyanma.c"), + Object(NonMatching, "data/model/act_m_shiokara.c"), + Object(NonMatching, "data/model/act_m_suzumushi.c"), + Object(NonMatching, "data/model/act_m_syouryou.c"), + Object(NonMatching, "data/model/act_m_tamamushi.c"), + Object(NonMatching, "data/model/act_m_tentou.c"), + Object(NonMatching, "data/model/act_m_tonosama.c"), + Object(NonMatching, "data/model/act_m_tukutuku.c"), + Object(NonMatching, "data/model/ef_otiba.c"), + Object(NonMatching, "data/model/obj_toudai_pole.c"), + Object(NonMatching, "data/model/obj_toudai_switch.c"), + Object(NonMatching, "data/model/obj_s_post.c"), + Object(NonMatching, "data/model/obj_s_post_delivery.c"), + Object(NonMatching, "data/model/obj_s_post_flag_off.c"), + Object(NonMatching, "data/model/obj_s_post_flag_on.c"), + Object(NonMatching, "data/model/obj_s_post_flag_on_wait_anim.c"), + Object(NonMatching, "data/model/obj_s_post_flag_on_wait.c"), + Object(NonMatching, "data/model/obj_s_post_flag_model.c"), + Object(NonMatching, "data/model/obj_s_post_open.c"), + Object(NonMatching, "data/model/obj_w_post_flag_on_wait_anim.c"), + Object(NonMatching, "data/model/obj_w_post_model.c"), + Object(NonMatching, "data/model/obj_misin_cloth.c"), + Object(NonMatching, "data/model/obj_misin.c"), + Object(NonMatching, "data/model/rom_myhome1_floor.c"), + Object(NonMatching, "data/model/rom_myhome1_wall.c"), + Object(NonMatching, "data/model/rom_myhome2_floor.c"), + Object(NonMatching, "data/model/rom_myhome2_wall.c"), + Object(NonMatching, "data/model/rom_myhome2B_flooar.c"), + Object(NonMatching, "data/model/rom_myhome2B_wall.c"), + Object(NonMatching, "data/model/rom_myhome3_floor.c"), + Object(NonMatching, "data/model/rom_myhome3_wall.c"), + Object(NonMatching, "data/model/rom_myhome4_1_floor.c"), + Object(NonMatching, "data/model/rom_myhome4_1_wall.c"), + Object(NonMatching, "data/model/rom_myhome4_2_floor.c"), + Object(NonMatching, "data/model/rom_myhome4_2_wall.c"), + Object(Matching, "data/model/rom_myhome_ug.c"), + Object(Matching, "data/model/furniture_pull.c"), + Object(Matching, "data/model/furniture_push.c"), + Object(Matching, "data/model/furniture_stop.c"), + + Object(NonMatching, "data/npc/npc_1_a1.c"), + Object(NonMatching, "data/npc/npc_1_a2.c"), + Object(NonMatching, "data/npc/npc_1_a2_r1.c"), + Object(NonMatching, "data/npc/npc_1_a_f1.c"), + Object(NonMatching, "data/npc/npc_1_a_f2.c"), + Object(NonMatching, "data/npc/npc_1_a_r1.c"), + Object(NonMatching, "data/npc/npc_1_a_r2.c"), + Object(NonMatching, "data/npc/npc_1_aisatu1.c"), + Object(NonMatching, "data/npc/npc_1_aisatu2.c"), + Object(NonMatching, "data/npc/npc_1_aisatu3.c"), + Object(NonMatching, "data/npc/npc_1_aisatu4.c"), + Object(NonMatching, "data/npc/npc_1_akireru_r1.c"), + Object(NonMatching, "data/npc/npc_1_akireru_r2.c"), + Object(NonMatching, "data/npc/npc_1_aseru1.c"), + Object(NonMatching, "data/npc/npc_1_aseru2.c"), + Object(NonMatching, "data/npc/npc_1_aseru_f1.c"), + Object(NonMatching, "data/npc/npc_1_aseru_f2.c"), + Object(NonMatching, "data/npc/npc_1_aseru_i1.c"), + Object(NonMatching, "data/npc/npc_1_aseru_i2.c"), + Object(NonMatching, "data/npc/npc_1_buruburu1.c"), + Object(NonMatching, "data/npc/npc_1_buruburu2.c"), + Object(NonMatching, "data/npc/npc_1_contract1.c"), + Object(NonMatching, "data/npc/npc_1_contract2.c"), + Object(NonMatching, "data/npc/npc_1_contract3.c"), + Object(NonMatching, "data/npc/npc_1_not_contract1.c"), + Object(NonMatching, "data/npc/npc_1_cracker_count1.c"), + Object(NonMatching, "data/npc/npc_1_cracker_fire1.c"), + Object(NonMatching, "data/npc/npc_1_cracker_run1.c"), + Object(NonMatching, "data/npc/npc_1_cracker_wait1.c"), + Object(NonMatching, "data/npc/npc_1_getup_seg1.c"), + Object(NonMatching, "data/npc/npc_1_getup_wait_seg1.c"), + Object(NonMatching, "data/npc/npc_1_piku_seg1.c"), + Object(NonMatching, "data/npc/npc_1_delivery1.c"), + Object(NonMatching, "data/npc/npc_1_fly1.c"), + Object(NonMatching, "data/npc/npc_1_flyaway1.c"), + Object(NonMatching, "data/npc/npc_1_kyoro1.c"), + Object(NonMatching, "data/npc/npc_1_landing1.c"), + Object(NonMatching, "data/npc/npc_1_landing2.c"), + Object(NonMatching, "data/npc/npc_1_landing3.c"), + Object(NonMatching, "data/npc/npc_1_gaaan1.c"), + Object(NonMatching, "data/npc/npc_1_gaaan2.c"), + Object(NonMatching, "data/npc/npc_1_gekido_r1.c"), + Object(NonMatching, "data/npc/npc_1_gekido_r2.c"), + Object(NonMatching, "data/npc/npc_1_estimate_f1.c"), + Object(NonMatching, "data/npc/npc_1_get1.c"), + Object(NonMatching, "data/npc/npc_1_get_change1.c"), + Object(NonMatching, "data/npc/npc_1_get_eat1.c"), + Object(NonMatching, "data/npc/npc_1_get_f1.c"), + Object(NonMatching, "data/npc/npc_1_get_pull1.c"), + Object(NonMatching, "data/npc/npc_1_get_pull_f1.c"), + Object(NonMatching, "data/npc/npc_1_get_pull_wait1.c"), + Object(NonMatching, "data/npc/npc_1_get_pull_wait_f1.c"), + Object(NonMatching, "data/npc/npc_1_get_putaway1.c"), + Object(NonMatching, "data/npc/npc_1_get_putaway_f1.c"), + Object(NonMatching, "data/npc/npc_1_get_return1.c"), + Object(NonMatching, "data/npc/npc_1_get_return_f1.c"), + Object(NonMatching, "data/npc/npc_1_gstwait1.c"), + Object(NonMatching, "data/npc/npc_1_goukyu1.c"), + Object(NonMatching, "data/npc/npc_1_goukyu2.c"), + Object(NonMatching, "data/npc/npc_1_ha1.c"), + Object(NonMatching, "data/npc/npc_1_ha2.c"), + Object(NonMatching, "data/npc/npc_1_ha_e1.c"), + Object(NonMatching, "data/npc/npc_1_ha_e2.c"), + Object(NonMatching, "data/npc/npc_1_ha_f1.c"), + Object(NonMatching, "data/npc/npc_1_ha_f2.c"), + Object(NonMatching, "data/npc/npc_1_ha_i1.c"), + Object(NonMatching, "data/npc/npc_1_ha_i2.c"), + Object(NonMatching, "data/npc/npc_1_banzai1.c"), + Object(NonMatching, "data/npc/npc_1_clap1.c"), + Object(NonMatching, "data/npc/npc_1_utiwa_wait1.c"), + Object(NonMatching, "data/npc/npc_1_dance1.c"), + Object(NonMatching, "data/npc/npc_1_sitdown_clap1.c"), + Object(NonMatching, "data/npc/npc_1_sitdown_drink1.c"), + Object(NonMatching, "data/npc/npc_1_sitdown_happy1.c"), + Object(NonMatching, "data/npc/npc_1_happy1.c"), + Object(NonMatching, "data/npc/npc_1_happy2.c"), + Object(NonMatching, "data/npc/npc_1_happy_f1.c"), + Object(NonMatching, "data/npc/npc_1_happy_f2.c"), + Object(NonMatching, "data/npc/npc_1_happy_i1.c"), + Object(NonMatching, "data/npc/npc_1_happy_i2.c"), + Object(NonMatching, "data/npc/npc_1_hate1.c"), + Object(NonMatching, "data/npc/npc_1_hate2.c"), + Object(NonMatching, "data/npc/npc_1_hate_f1.c"), + Object(NonMatching, "data/npc/npc_1_hate_f2.c"), + Object(NonMatching, "data/npc/npc_1_hate_i1.c"), + Object(NonMatching, "data/npc/npc_1_hate_i2.c"), + Object(NonMatching, "data/npc/npc_1_omairi1.c"), + Object(NonMatching, "data/npc/npc_1_saisen1.c"), + Object(NonMatching, "data/npc/npc_1_hirameki1.c"), + Object(NonMatching, "data/npc/npc_1_hirameki2.c"), + Object(NonMatching, "data/npc/npc_1_hyuuu1.c"), + Object(NonMatching, "data/npc/npc_1_hyuuu2.c"), + Object(NonMatching, "data/npc/npc_1_hyuuu_r1.c"), + Object(NonMatching, "data/npc/npc_1_hyuuu_r2.c"), + Object(NonMatching, "data/npc/npc_1_wipkogu1.c"), + Object(NonMatching, "data/npc/npc_1_wipwait1.c"), + Object(NonMatching, "data/npc/npc_1_wipwait2.c"), + Object(NonMatching, "data/npc/npc_1_keirei1.c"), + Object(NonMatching, "data/npc/npc_1_kieeeei1.c"), + Object(NonMatching, "data/npc/npc_1_kieeeei2.c"), + Object(NonMatching, "data/npc/npc_1_gaaan_d1.c"), + Object(NonMatching, "data/npc/npc_1_gaaan_d2.c"), + Object(NonMatching, "data/npc/npc_1_ha_d1.c"), + Object(NonMatching, "data/npc/npc_1_ha_d2.c"), + Object(NonMatching, "data/npc/npc_1_hate_d1.c"), + Object(NonMatching, "data/npc/npc_1_hate_d2.c"), + Object(NonMatching, "data/npc/npc_1_hirameki_d1.c"), + Object(NonMatching, "data/npc/npc_1_hirameki_d2.c"), + Object(NonMatching, "data/npc/npc_1_keitai_off1.c"), + Object(NonMatching, "data/npc/npc_1_keitai_on1.c"), + Object(NonMatching, "data/npc/npc_1_keitai_talk1.c"), + Object(NonMatching, "data/npc/npc_1_keitai_talk2.c"), + Object(NonMatching, "data/npc/npc_1_komari_d1.c"), + Object(NonMatching, "data/npc/npc_1_musu_d1.c"), + Object(NonMatching, "data/npc/npc_1_niko_d1.c"), + Object(NonMatching, "data/npc/npc_1_open_d1.c"), + Object(NonMatching, "data/npc/npc_1_open_d2.c"), + Object(NonMatching, "data/npc/npc_1_sitdown_d1.c"), + Object(NonMatching, "data/npc/npc_1_sitdown_wait_d1.c"), + Object(NonMatching, "data/npc/npc_1_smile_d1.c"), + Object(NonMatching, "data/npc/npc_1_smile_d2.c"), + Object(NonMatching, "data/npc/npc_1_standup_d1.c"), + Object(NonMatching, "data/npc/npc_1_to_deck_d1.c"), + Object(NonMatching, "data/npc/npc_1_komari1.c"), + Object(NonMatching, "data/npc/npc_1_komari_f1.c"), + Object(NonMatching, "data/npc/npc_1_komari_i1.c"), + Object(NonMatching, "data/npc/npc_1_kutipaku1.c"), + Object(NonMatching, "data/npc/npc_1_kutipaku2.c"), + Object(NonMatching, "data/npc/npc_1_love1.c"), + Object(NonMatching, "data/npc/npc_1_love2.c"), + Object(NonMatching, "data/npc/npc_1_love_i1.c"), + Object(NonMatching, "data/npc/npc_1_love_i2.c"), + Object(NonMatching, "data/npc/npc_1_lovelove1.c"), + Object(NonMatching, "data/npc/npc_1_lovelove2.c"), + Object(NonMatching, "data/npc/npc_1_lovelove_f1.c"), + Object(NonMatching, "data/npc/npc_1_lovelove_f2.c"), + Object(NonMatching, "data/npc/npc_1_appear1.c"), + Object(NonMatching, "data/npc/npc_1_go_ug1.c"), + Object(NonMatching, "data/npc/npc_1_wait_r1.c"), + Object(NonMatching, "data/npc/npc_1_matarou_r1.c"), + Object(NonMatching, "data/npc/npc_1_matarou_r2.c"), + Object(NonMatching, "data/npc/npc_1_misin1.c"), + Object(NonMatching, "data/npc/npc_1_run1.c"), + Object(NonMatching, "data/npc/npc_1_wait1.c"), + Object(NonMatching, "data/npc/npc_1_wait_ai1.c"), + Object(NonMatching, "data/npc/npc_1_wait_do1.c"), + Object(NonMatching, "data/npc/npc_1_wait_ki1.c"), + Object(NonMatching, "data/npc/npc_1_wait_nemu1.c"), + Object(NonMatching, "data/npc/npc_1_walk1.c"), + Object(NonMatching, "data/npc/npc_1_walk_ai1.c"), + Object(NonMatching, "data/npc/npc_1_walk_do1.c"), + Object(NonMatching, "data/npc/npc_1_walk_ki1.c"), + Object(NonMatching, "data/npc/npc_1_muka1.c"), + Object(NonMatching, "data/npc/npc_1_muka2.c"), + Object(NonMatching, "data/npc/npc_1_musu1.c"), + Object(NonMatching, "data/npc/npc_1_musu_f1.c"), + Object(NonMatching, "data/npc/npc_1_musu_i1.c"), + Object(NonMatching, "data/npc/npc_1_musu_r1.c"), + Object(NonMatching, "data/npc/npc_1_muuuuu1.c"), + Object(NonMatching, "data/npc/npc_1_muuuuu2.c"), + Object(NonMatching, "data/npc/npc_1_muuuuu_f1.c"), + Object(NonMatching, "data/npc/npc_1_muuuuu_f2.c"), + Object(NonMatching, "data/npc/npc_1_muuuuu_i1.c"), + Object(NonMatching, "data/npc/npc_1_muuuuu_i2.c"), + Object(NonMatching, "data/npc/npc_1_neboke1.c"), + Object(NonMatching, "data/npc/npc_1_neboke2.c"), + Object(NonMatching, "data/npc/npc_1_niko1.c"), + Object(NonMatching, "data/npc/npc_1_niko_f1.c"), + Object(NonMatching, "data/npc/npc_1_niko_i1.c"), + Object(NonMatching, "data/npc/npc_1_kokkuri_d1.c"), + Object(NonMatching, "data/npc/npc_1_kokkuri_d2.c"), + Object(NonMatching, "data/npc/npc_1_go_out1.c"), + Object(NonMatching, "data/npc/npc_1_open1.c"), + Object(NonMatching, "data/npc/npc_1_otikomu1.c"), + Object(NonMatching, "data/npc/npc_1_otikomu2.c"), + Object(NonMatching, "data/npc/npc_1_deru1.c"), + Object(NonMatching, "data/npc/npc_1_deru2.c"), + Object(NonMatching, "data/npc/npc_1_guratuku1.c"), + Object(NonMatching, "data/npc/npc_1_mogaku1.c"), + Object(NonMatching, "data/npc/npc_1_otiru1.c"), + Object(NonMatching, "data/npc/npc_1_otiru2.c"), + Object(NonMatching, "data/npc/npc_1_punpun1.c"), + Object(NonMatching, "data/npc/npc_1_punpun2.c"), + Object(NonMatching, "data/npc/npc_1_punpun_r1.c"), + Object(NonMatching, "data/npc/npc_1_punpun_r2.c"), + Object(NonMatching, "data/npc/npc_1_gyafun1.c"), + Object(NonMatching, "data/npc/npc_1_gyafun2.c"), + Object(NonMatching, "data/npc/npc_1_shituren1.c"), + Object(NonMatching, "data/npc/npc_1_shituren2.c"), + Object(NonMatching, "data/npc/npc_1_shituren_i1.c"), + Object(NonMatching, "data/npc/npc_1_shituren_i2.c"), + Object(NonMatching, "data/npc/npc_1_smile1.c"), + Object(NonMatching, "data/npc/npc_1_smile2.c"), + Object(NonMatching, "data/npc/npc_1_smile_f1.c"), + Object(NonMatching, "data/npc/npc_1_smile_f2.c"), + Object(NonMatching, "data/npc/npc_1_intro1_a.c"), + Object(NonMatching, "data/npc/npc_1_intro1_b.c"), + Object(NonMatching, "data/npc/npc_1_kiduku1.c"), + Object(NonMatching, "data/npc/npc_1_kiduku2.c"), + Object(NonMatching, "data/npc/npc_1_taisou1.c"), + Object(NonMatching, "data/npc/npc_1_taisou2.c"), + Object(NonMatching, "data/npc/npc_1_taisou3_a.c"), + Object(NonMatching, "data/npc/npc_1_taisou3_b.c"), + Object(NonMatching, "data/npc/npc_1_taisou4_a.c"), + Object(NonMatching, "data/npc/npc_1_taisou4_b.c"), + Object(NonMatching, "data/npc/npc_1_taisou5_a.c"), + Object(NonMatching, "data/npc/npc_1_taisou5_b.c"), + Object(NonMatching, "data/npc/npc_1_taisou6_a.c"), + Object(NonMatching, "data/npc/npc_1_taisou6_b.c"), + Object(NonMatching, "data/npc/npc_1_taisou7.c"), + Object(NonMatching, "data/npc/npc_1_tamahiroi1.c"), + Object(NonMatching, "data/npc/npc_1_tamanage1.c"), + Object(NonMatching, "data/npc/npc_1_asihumi1.c"), + Object(NonMatching, "data/npc/npc_1_don1.c"), + Object(NonMatching, "data/npc/npc_1_kokeru1.c"), + Object(NonMatching, "data/npc/npc_1_kokeru_getup1.c"), + Object(NonMatching, "data/npc/npc_1_ready1.c"), + Object(NonMatching, "data/npc/npc_1_tamakome1.c"), + Object(NonMatching, "data/npc/npc_1_tired1.c"), + Object(NonMatching, "data/npc/npc_1_warmup1.c"), + Object(NonMatching, "data/npc/npc_1_youi1.c"), + Object(NonMatching, "data/npc/npc_1_3haku_e1.c"), + Object(NonMatching, "data/npc/npc_1_4haku_e1.c"), + Object(NonMatching, "data/npc/npc_1_ensou_e1.c"), + Object(NonMatching, "data/npc/npc_1_wait_e1.c"), + Object(NonMatching, "data/npc/npc_1_send_mail1.c"), + Object(NonMatching, "data/npc/npc_1_trans_wait1.c"), + Object(NonMatching, "data/npc/npc_1_trans_wait_f1.c"), + Object(NonMatching, "data/npc/npc_1_transfer1.c"), + Object(NonMatching, "data/npc/npc_1_transfer_f1.c"), + Object(NonMatching, "data/npc/npc_1_tue1.c"), + Object(NonMatching, "data/npc/npc_1_kuisinbo1.c"), + Object(NonMatching, "data/npc/npc_1_sanbasi1.c"), + Object(NonMatching, "data/npc/npc_1_hatafuri1.c"), + Object(NonMatching, "data/npc/npc_1_tunahiki_aiko1.c"), + Object(NonMatching, "data/npc/npc_1_tunahiki_furi1.c"), + Object(NonMatching, "data/npc/npc_1_tunahiki_yuri1.c"), + Object(NonMatching, "data/npc/npc_1_turi_wait1.c"), + Object(NonMatching, "data/npc/npc_1_tkukoro1.c"), + Object(NonMatching, "data/npc/npc_1_umb_close1.c"), + Object(NonMatching, "data/npc/npc_1_umb_open1.c"), + Object(NonMatching, "data/npc/npc_1_umbrella1.c"), + Object(NonMatching, "data/npc/npc_1_warudakumi1.c"), + Object(NonMatching, "data/npc/npc_1_warudakumi2.c"), ], ), ] diff --git a/src/data/model/act_balloon.c b/src/data/model/act_balloon.c index 9275a602..c9212377 100644 --- a/src/data/model/act_balloon.c +++ b/src/data/model/act_balloon.c @@ -86,12 +86,13 @@ s16 cKF_ds_act_balloon_tbl[] = { 1, -100, 20, 10, -57, 252, 32, 99, -3 -38, 61, -100, -20, 1, 24, 130, 14, 47, -54, 43, -49, 37, 61, 24, 136, 1, -24, -130, 14, -47, 54, 43, 49, -37, 61, -24, -136 }; -cKF_Animation_R_c cKF_ba_r_act_balloon[] = { { cKF_ckcb_r_act_balloon_tbl, cKF_ds_act_balloon_tbl, - cKF_kn_act_balloon_tbl, cKF_c_act_balloon_tbl, -1, 61 } }; +cKF_Animation_R_c cKF_ba_r_act_balloon = { + cKF_ckcb_r_act_balloon_tbl, cKF_ds_act_balloon_tbl, cKF_kn_act_balloon_tbl, cKF_c_act_balloon_tbl, -1, 61 +}; cKF_Joint_R_c cKF_je_r_act_balloon_tbl[] = { { NULL, 1, cKF_JOINT_FLAG_DISP_OPA, { 0, 1500, 0 } }, { act_balloon_wireA_model, 1, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } }, { act_balloon_wireB_model, 1, cKF_JOINT_FLAG_DISP_OPA, { 1250, 0, 0 } }, { act_balloon_head_model, 0, cKF_JOINT_FLAG_DISP_OPA, { 1250, 0, 0 } } }; -cKF_Skeleton_R_c cKF_bs_r_act_balloon[] = { { ARRAY_COUNT(cKF_je_r_act_balloon_tbl), 3, cKF_je_r_act_balloon_tbl } }; +cKF_Skeleton_R_c cKF_bs_r_act_balloon = { ARRAY_COUNT(cKF_je_r_act_balloon_tbl), 3, cKF_je_r_act_balloon_tbl }; diff --git a/src/data/model/act_bee.c b/src/data/model/act_bee.c index 21029112..4f697d99 100644 --- a/src/data/model/act_bee.c +++ b/src/data/model/act_bee.c @@ -79,12 +79,13 @@ s16 cKF_c_act_bee_tbl[] = { 0, 0, 0, 0, 900, 0, 0, 0, 0, 0, 0, 0, 0 }; s16 cKF_ds_act_bee_tbl[] = { 1, 300, -100, 181, -300, -100, 1, 300, -100, 181, -300, -100 }; -cKF_Animation_R_c cKF_ba_r_act_bee[] = { { cKF_ckcb_r_act_bee_tbl, cKF_ds_act_bee_tbl, cKF_kn_act_bee_tbl, - cKF_c_act_bee_tbl, -1, 181 } }; +cKF_Animation_R_c cKF_ba_r_act_bee = { + cKF_ckcb_r_act_bee_tbl, cKF_ds_act_bee_tbl, cKF_kn_act_bee_tbl, cKF_c_act_bee_tbl, -1, 181 +}; cKF_Joint_R_c cKF_je_r_act_bee_tbl[] = { { NULL, 1, cKF_JOINT_FLAG_DISP_XLU, { 0, 0, 0 } }, { act_bee_A_model, 1, cKF_JOINT_FLAG_DISP_XLU, { 0, 0, 0 } }, { act_bee_B_model, 1, cKF_JOINT_FLAG_DISP_XLU, { 1000, 0, 0 } }, { act_bee_C_model, 0, cKF_JOINT_FLAG_DISP_XLU, { 1500, 0, 0 } } }; -cKF_Skeleton_R_c cKF_bs_r_act_bee[] = { { ARRAY_COUNT(cKF_je_r_act_bee_tbl), 3, cKF_je_r_act_bee_tbl } }; +cKF_Skeleton_R_c cKF_bs_r_act_bee = { ARRAY_COUNT(cKF_je_r_act_bee_tbl), 3, cKF_je_r_act_bee_tbl }; diff --git a/src/data/model/act_f01_funa.c b/src/data/model/act_f01_funa.c new file mode 100644 index 00000000..6f621252 --- /dev/null +++ b/src/data/model/act_f01_funa.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f01_funa_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f01_funa_pal.inc" +}; + +u8 act_f01_funa_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f01_funa_tex.inc" +}; + +Vtx act_f01_funa_a_v[] = { +#include "assets/act_f01_funa_a_v.inc" +}; + +Gfx act_f01_funa_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f01_funa_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f01_funa_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f01_funa_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f01_funa_b_v[] = { +#include "assets/act_f01_funa_b_v.inc" +}; + +Gfx act_f01_funa_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f01_funa_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f01_funa_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f01_funa_b_v, 10, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 7, 1, 6, 8, 9), + gsSPNTriangles_5b(6, 9, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f01_funa_c_v[] = { +#include "assets/act_f01_funa_c_v.inc" +}; + +Gfx act_f01_funa_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f01_funa_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f01_funa_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f01_funa_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 0, 3, 4), + gsSPNTriangles_5b(5, 0, 4, 4, 3, 6, 4, 6, 7, 4, 7, 8), + gsSPNTriangles_5b(5, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f02_hera.c b/src/data/model/act_f02_hera.c new file mode 100644 index 00000000..b2afe2aa --- /dev/null +++ b/src/data/model/act_f02_hera.c @@ -0,0 +1,74 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + + +u16 act_f02_hera_pal[] ATTRIBUTE_ALIGN(32)= { +#include "assets/act_f02_hera_pal.inc" +}; + +u8 act_f02_hera_tex[] ATTRIBUTE_ALIGN(32)= { +#include "assets/act_f02_hera_tex.inc" +}; + +Vtx act_f02_hera_a_v[] = { +#include "assets/act_f02_hera_a_v.inc" +}; + +Gfx act_f02_hera_aT_model[] = { +gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), +gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), +gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), +gsDPLoadTLUT_Dolphin(15, 16, 1, act_f02_hera_pal), +gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f02_hera_tex), +gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), +gsDPSetPrimColor(0, 128, 255, 255, 255, 255), +gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), +gsSPVertex(act_f02_hera_a_v, 9, 0), +gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), +gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), +gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), +gsSPEndDisplayList(), +}; + +Vtx act_f02_hera_b_v[] = { +#include "assets/act_f02_hera_b_v.inc" +}; + +Gfx act_f02_hera_bT_model[] = { +gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), +gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), +gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), +gsDPLoadTLUT_Dolphin(15, 16, 1, act_f02_hera_pal), +gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f02_hera_tex), +gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), +gsDPSetPrimColor(0, 128, 255, 255, 255, 255), +gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), +gsSPVertex(act_f02_hera_b_v, 9, 0), +gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), +gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), +gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), +gsSPEndDisplayList(), +}; + +Vtx act_f02_hera_c_v[] = { +#include "assets/act_f02_hera_c_v.inc" +}; + +Gfx act_f02_hera_cT_model[] = { +gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), +gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), +gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), +gsDPLoadTLUT_Dolphin(15, 16, 1, act_f02_hera_pal), +gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f02_hera_tex), +gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), +gsDPSetPrimColor(0, 128, 255, 255, 255, 255), +gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), +gsSPVertex(act_f02_hera_c_v, 9, 0), +gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), +gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), +gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), +gsSPEndDisplayList(), +}; + diff --git a/src/data/model/act_f03_koi.c b/src/data/model/act_f03_koi.c new file mode 100644 index 00000000..ca9928a6 --- /dev/null +++ b/src/data/model/act_f03_koi.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f03_koi_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f03_koi_pal.inc" +}; + +u8 act_f03_koi_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f03_koi_tex.inc" +}; + +Vtx act_f03_koi_a_v[] = { +#include "assets/act_f03_koi_a_v.inc" +}; + +Gfx act_f03_koi_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f03_koi_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f03_koi_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f03_koi_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f03_koi_b_v[] = { +#include "assets/act_f03_koi_b_v.inc" +}; + +Gfx act_f03_koi_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f03_koi_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f03_koi_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f03_koi_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f03_koi_c_v[] = { +#include "assets/act_f03_koi_c_v.inc" +}; + +Gfx act_f03_koi_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f03_koi_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f03_koi_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f03_koi_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 0, 3, 4), + gsSPNTriangles_5b(5, 0, 4, 4, 3, 6, 4, 6, 7, 4, 7, 8), + gsSPNTriangles_5b(5, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f04_nisiki.c b/src/data/model/act_f04_nisiki.c new file mode 100644 index 00000000..30c9eea7 --- /dev/null +++ b/src/data/model/act_f04_nisiki.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f04_nisiki_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f04_nisiki_pal.inc" +}; + +u8 act_f04_nisiki_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f04_nisiki_tex.inc" +}; + +Vtx act_f04_nisiki_a_v[] = { +#include "assets/act_f04_nisiki_a_v.inc" +}; + +Gfx act_f04_nisiki_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f04_nisiki_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f04_nisiki_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f04_nisiki_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f04_nisiki_b_v[] = { +#include "assets/act_f04_nisiki_b_v.inc" +}; + +Gfx act_f04_nisiki_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f04_nisiki_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f04_nisiki_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f04_nisiki_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f04_nisiki_c_v[] = { +#include "assets/act_f04_nisiki_c_v.inc" +}; + +Gfx act_f04_nisiki_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f04_nisiki_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f04_nisiki_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f04_nisiki_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 0, 3, 4), + gsSPNTriangles_5b(5, 0, 4, 4, 3, 6, 4, 6, 7, 4, 7, 8), + gsSPNTriangles_5b(5, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f05_namazu.c b/src/data/model/act_f05_namazu.c new file mode 100644 index 00000000..b65925bb --- /dev/null +++ b/src/data/model/act_f05_namazu.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f05_namazu_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f05_namazu_pal.inc" +}; + +u8 act_f05_namazu_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f05_namazu_tex.inc" +}; + +Vtx act_f05_namazu_a_v[] = { +#include "assets/act_f05_namazu_a_v.inc" +}; + +Gfx act_f05_namazu_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f05_namazu_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f05_namazu_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f05_namazu_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f05_namazu_b_v[] = { +#include "assets/act_f05_namazu_b_v.inc" +}; + +Gfx act_f05_namazu_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f05_namazu_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f05_namazu_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f05_namazu_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f05_namazu_c_v[] = { +#include "assets/act_f05_namazu_c_v.inc" +}; + +Gfx act_f05_namazu_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f05_namazu_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f05_namazu_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f05_namazu_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 0, 3, 4), + gsSPNTriangles_5b(5, 0, 4, 4, 3, 6, 4, 6, 7, 4, 7, 8), + gsSPNTriangles_5b(5, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f06_bass.c b/src/data/model/act_f06_bass.c new file mode 100644 index 00000000..6dfd65af --- /dev/null +++ b/src/data/model/act_f06_bass.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f06_bass_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f06_bass_pal.inc" +}; + +u8 act_f06_bass_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f06_bass_tex.inc" +}; + +Vtx act_f06_bass_a_v[] = { +#include "assets/act_f06_bass_a_v.inc" +}; + +Gfx act_f06_bass_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f06_bass_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f06_bass_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f06_bass_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f06_bass_b_v[] = { +#include "assets/act_f06_bass_b_v.inc" +}; + +Gfx act_f06_bass_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f06_bass_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f06_bass_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f06_bass_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f06_bass_c_v[] = { +#include "assets/act_f06_bass_c_v.inc" +}; + +Gfx act_f06_bass_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f06_bass_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f06_bass_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f06_bass_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 0, 3, 4), + gsSPNTriangles_5b(5, 0, 4, 4, 3, 6, 4, 6, 7, 4, 7, 8), + gsSPNTriangles_5b(5, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f07_bassm.c b/src/data/model/act_f07_bassm.c new file mode 100644 index 00000000..c18328b3 --- /dev/null +++ b/src/data/model/act_f07_bassm.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f07_bassm_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f07_bassm_pal.inc" +}; + +u8 act_f07_bassm_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f07_bassm_tex.inc" +}; + +Vtx act_f07_bassm_a_v[] = { +#include "assets/act_f07_bassm_a_v.inc" +}; + +Gfx act_f07_bassm_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f07_bassm_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f07_bassm_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f07_bassm_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f07_bassm_b_v[] = { +#include "assets/act_f07_bassm_b_v.inc" +}; + +Gfx act_f07_bassm_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f07_bassm_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f07_bassm_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f07_bassm_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f07_bassm_c_v[] = { +#include "assets/act_f07_bassm_c_v.inc" +}; + +Gfx act_f07_bassm_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f07_bassm_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f07_bassm_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f07_bassm_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 3, 0, 2, 2, 1, 4), + gsSPNTriangles_5b(2, 4, 5, 2, 5, 6, 3, 2, 6, 0, 7, 8), + gsSPNTriangles_5b(0, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f08_bassl.c b/src/data/model/act_f08_bassl.c new file mode 100644 index 00000000..c2966b46 --- /dev/null +++ b/src/data/model/act_f08_bassl.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f08_bassl_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f08_bassl_pal.inc" +}; + +u8 act_f08_bassl_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f08_bassl_tex.inc" +}; + +Vtx act_f08_bassl_a_v[] = { +#include "assets/act_f08_bassl_a_v.inc" +}; + +Gfx act_f08_bassl_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f08_bassl_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f08_bassl_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f08_bassl_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f08_bassl_b_v[] = { +#include "assets/act_f08_bassl_b_v.inc" +}; + +Gfx act_f08_bassl_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f08_bassl_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f08_bassl_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f08_bassl_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f08_bassl_c_v[] = { +#include "assets/act_f08_bassl_c_v.inc" +}; + +Gfx act_f08_bassl_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f08_bassl_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f08_bassl_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f08_bassl_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f09_gill.c b/src/data/model/act_f09_gill.c new file mode 100644 index 00000000..88d570a4 --- /dev/null +++ b/src/data/model/act_f09_gill.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f09_gill_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f09_gill_pal.inc" +}; + +u8 act_f09_gill_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f09_gill_tex.inc" +}; + +Vtx act_f09_gill_a_v[] = { +#include "assets/act_f09_gill_a_v.inc" +}; + +Gfx act_f09_gill_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f09_gill_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f09_gill_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f09_gill_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f09_gill_b_v[] = { +#include "assets/act_f09_gill_b_v.inc" +}; + +Gfx act_f09_gill_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f09_gill_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f09_gill_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f09_gill_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f09_gill_c_v[] = { +#include "assets/act_f09_gill_c_v.inc" +}; + +Gfx act_f09_gill_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f09_gill_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f09_gill_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f09_gill_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 0, 3, 4), + gsSPNTriangles_5b(5, 0, 4, 4, 3, 6, 4, 6, 7, 4, 7, 8), + gsSPNTriangles_5b(5, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f10_oonamazu.c b/src/data/model/act_f10_oonamazu.c new file mode 100644 index 00000000..8e4803cc --- /dev/null +++ b/src/data/model/act_f10_oonamazu.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f10_oonamazu_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f10_oonamazu_pal.inc" +}; + +u8 act_f10_oonamazu_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f10_oonamazu_tex.inc" +}; + +Vtx act_f10_oonamazu_a_v[] = { +#include "assets/act_f10_oonamazu_a_v.inc" +}; + +Gfx act_f10_oonamazu_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f10_oonamazu_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 32, act_f10_oonamazu_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f10_oonamazu_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f10_oonamazu_b_v[] = { +#include "assets/act_f10_oonamazu_b_v.inc" +}; + +Gfx act_f10_oonamazu_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f10_oonamazu_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 32, act_f10_oonamazu_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f10_oonamazu_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 0, 3, 4), + gsSPNTriangles_5b(5, 0, 4, 4, 3, 6, 4, 6, 7, 4, 7, 8), + gsSPNTriangles_5b(5, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f10_oonamazu_c_v[] = { +#include "assets/act_f10_oonamazu_c_v.inc" +}; + +Gfx act_f10_oonamazu_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f10_oonamazu_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 32, act_f10_oonamazu_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f10_oonamazu_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 3, 0, 2, 2, 1, 4), + gsSPNTriangles_5b(2, 4, 5, 2, 5, 6, 3, 2, 6, 0, 7, 8), + gsSPNTriangles_5b(0, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f11_raigyo.c b/src/data/model/act_f11_raigyo.c new file mode 100644 index 00000000..3d166b00 --- /dev/null +++ b/src/data/model/act_f11_raigyo.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f11_raigyo_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f11_raigyo_pal.inc" +}; + +u8 act_f11_raigyo_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f11_raigyo_tex.inc" +}; + +Vtx act_f11_raigyo_a_v[] = { +#include "assets/act_f11_raigyo_a_v.inc" +}; + +Gfx act_f11_raigyo_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f11_raigyo_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 32, act_f11_raigyo_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f11_raigyo_a_v, 10, 0), + gsSPNTrianglesInit_5b(10, 0, 1, 2, 1, 3, 2, 0, 2, 4), + gsSPNTriangles_5b(2, 5, 4, 2, 3, 5, 1, 6, 3, 0, 7, 1), + gsSPNTriangles_5b(7, 6, 1, 7, 8, 9, 7, 9, 6, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f11_raigyo_b_v[] = { +#include "assets/act_f11_raigyo_b_v.inc" +}; + +Gfx act_f11_raigyo_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f11_raigyo_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 32, act_f11_raigyo_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f11_raigyo_b_v, 10, 0), + gsSPNTrianglesInit_5b(10, 0, 1, 2, 3, 0, 2, 2, 1, 4), + gsSPNTriangles_5b(5, 4, 6, 5, 6, 7, 3, 5, 7, 2, 4, 5), + gsSPNTriangles_5b(3, 2, 5, 0, 8, 9, 0, 9, 1, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f11_raigyo_c_v[] = { +#include "assets/act_f11_raigyo_c_v.inc" +}; + +Gfx act_f11_raigyo_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f11_raigyo_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 32, act_f11_raigyo_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f11_raigyo_c_v, 10, 0), + gsSPNTrianglesInit_5b(10, 0, 1, 2, 1, 3, 2, 0, 2, 4), + gsSPNTriangles_5b(2, 5, 4, 2, 3, 5, 1, 6, 3, 0, 7, 1), + gsSPNTriangles_5b(7, 6, 1, 7, 8, 9, 7, 9, 6, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f12_nigoi.c b/src/data/model/act_f12_nigoi.c new file mode 100644 index 00000000..79788ff3 --- /dev/null +++ b/src/data/model/act_f12_nigoi.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f12_nigoi_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f12_nigoi_pal.inc" +}; + +u8 act_f12_nigoi_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f12_nigoi_tex.inc" +}; + +Vtx act_f12_nigoi_a_v[] = { +#include "assets/act_f12_nigoi_a_v.inc" +}; + +Gfx act_f12_nigoi_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f12_nigoi_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f12_nigoi_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f12_nigoi_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f12_nigoi_b_v[] = { +#include "assets/act_f12_nigoi_b_v.inc" +}; + +Gfx act_f12_nigoi_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f12_nigoi_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f12_nigoi_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f12_nigoi_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f12_nigoi_c_v[] = { +#include "assets/act_f12_nigoi_c_v.inc" +}; + +Gfx act_f12_nigoi_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f12_nigoi_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f12_nigoi_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f12_nigoi_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 0, 3, 4), + gsSPNTriangles_5b(5, 0, 4, 4, 3, 6, 4, 6, 7, 4, 7, 8), + gsSPNTriangles_5b(5, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f13_ugui.c b/src/data/model/act_f13_ugui.c new file mode 100644 index 00000000..bba28c58 --- /dev/null +++ b/src/data/model/act_f13_ugui.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f13_ugui_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f13_ugui_pal.inc" +}; + +u8 act_f13_ugui_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f13_ugui_tex.inc" +}; + +Vtx act_f13_ugui_a_v[] = { +#include "assets/act_f13_ugui_a_v.inc" +}; + +Gfx act_f13_ugui_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f13_ugui_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f13_ugui_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f13_ugui_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f13_ugui_b_v[] = { +#include "assets/act_f13_ugui_b_v.inc" +}; + +Gfx act_f13_ugui_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f13_ugui_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f13_ugui_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f13_ugui_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f13_ugui_c_v[] = { +#include "assets/act_f13_ugui_c_v.inc" +}; + +Gfx act_f13_ugui_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f13_ugui_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f13_ugui_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f13_ugui_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f14_oikawa.c b/src/data/model/act_f14_oikawa.c new file mode 100644 index 00000000..7261c874 --- /dev/null +++ b/src/data/model/act_f14_oikawa.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f14_oikawa_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f14_oikawa_pal.inc" +}; + +u8 act_f14_oikawa_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f14_oikawa_tex.inc" +}; + +Vtx act_f14_oikawa_a_v[] = { +#include "assets/act_f14_oikawa_a_v.inc" +}; + +Gfx act_f14_oikawa_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f14_oikawa_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f14_oikawa_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f14_oikawa_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f14_oikawa_b_v[] = { +#include "assets/act_f14_oikawa_b_v.inc" +}; + +Gfx act_f14_oikawa_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f14_oikawa_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f14_oikawa_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f14_oikawa_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f14_oikawa_c_v[] = { +#include "assets/act_f14_oikawa_c_v.inc" +}; + +Gfx act_f14_oikawa_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f14_oikawa_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f14_oikawa_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f14_oikawa_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 3, 0, 2, 2, 1, 4), + gsSPNTriangles_5b(2, 4, 5, 2, 5, 6, 3, 2, 6, 0, 7, 8), + gsSPNTriangles_5b(0, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f15_tanago.c b/src/data/model/act_f15_tanago.c new file mode 100644 index 00000000..1aa5ad47 --- /dev/null +++ b/src/data/model/act_f15_tanago.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f15_tanago_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f15_tanago_pal.inc" +}; + +u8 act_f15_tanago_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f15_tanago_tex.inc" +}; + +Vtx act_f15_tanago_a_v[] = { +#include "assets/act_f15_tanago_a_v.inc" +}; + +Gfx act_f15_tanago_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f15_tanago_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f15_tanago_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f15_tanago_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f15_tanago_b_v[] = { +#include "assets/act_f15_tanago_b_v.inc" +}; + +Gfx act_f15_tanago_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f15_tanago_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f15_tanago_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f15_tanago_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f15_tanago_c_v[] = { +#include "assets/act_f15_tanago_c_v.inc" +}; + +Gfx act_f15_tanago_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f15_tanago_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f15_tanago_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f15_tanago_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 0, 3, 4), + gsSPNTriangles_5b(5, 0, 4, 4, 3, 6, 4, 6, 7, 4, 7, 8), + gsSPNTriangles_5b(5, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f16_dojyo.c b/src/data/model/act_f16_dojyo.c new file mode 100644 index 00000000..e021861d --- /dev/null +++ b/src/data/model/act_f16_dojyo.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f16_dojyo_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f16_dojyo_pal.inc" +}; + +u8 act_f16_dojyo_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f16_dojyo_tex.inc" +}; + +Vtx act_f16_dojyo_a_v[] = { +#include "assets/act_f16_dojyo_a_v.inc" +}; + +Gfx act_f16_dojyo_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f16_dojyo_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 16, act_f16_dojyo_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f16_dojyo_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f16_dojyo_b_v[] = { +#include "assets/act_f16_dojyo_b_v.inc" +}; + +Gfx act_f16_dojyo_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f16_dojyo_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 16, act_f16_dojyo_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f16_dojyo_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f16_dojyo_c_v[] = { +#include "assets/act_f16_dojyo_c_v.inc" +}; + +Gfx act_f16_dojyo_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f16_dojyo_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 16, act_f16_dojyo_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f16_dojyo_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f17_wakasagi.c b/src/data/model/act_f17_wakasagi.c new file mode 100644 index 00000000..ca7d577e --- /dev/null +++ b/src/data/model/act_f17_wakasagi.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f17_wakasagi_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f17_wakasagi_pal.inc" +}; + +u8 act_f17_wakasagi_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f17_wakasagi_tex.inc" +}; + +Vtx act_f17_wakasagi_a_v[] = { +#include "assets/act_f17_wakasagi_a_v.inc" +}; + +Gfx act_f17_wakasagi_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f17_wakasagi_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 16, act_f17_wakasagi_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f17_wakasagi_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f17_wakasagi_b_v[] = { +#include "assets/act_f17_wakasagi_b_v.inc" +}; + +Gfx act_f17_wakasagi_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f17_wakasagi_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 16, act_f17_wakasagi_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f17_wakasagi_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f17_wakasagi_c_v[] = { +#include "assets/act_f17_wakasagi_c_v.inc" +}; + +Gfx act_f17_wakasagi_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f17_wakasagi_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 16, act_f17_wakasagi_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f17_wakasagi_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 0, 3, 4), + gsSPNTriangles_5b(5, 0, 4, 4, 3, 6, 4, 6, 7, 4, 7, 8), + gsSPNTriangles_5b(5, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f18_ayu.c b/src/data/model/act_f18_ayu.c new file mode 100644 index 00000000..dcec9171 --- /dev/null +++ b/src/data/model/act_f18_ayu.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f18_ayu_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f18_ayu_pal.inc" +}; + +u8 act_f18_ayu_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f18_ayu_tex.inc" +}; + +Vtx act_f18_ayu_a_v[] = { +#include "assets/act_f18_ayu_a_v.inc" +}; + +Gfx act_f18_ayu_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f18_ayu_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f18_ayu_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f18_ayu_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f18_ayu_b_v[] = { +#include "assets/act_f18_ayu_b_v.inc" +}; + +Gfx act_f18_ayu_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f18_ayu_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f18_ayu_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f18_ayu_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f18_ayu_c_v[] = { +#include "assets/act_f18_ayu_c_v.inc" +}; + +Gfx act_f18_ayu_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f18_ayu_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f18_ayu_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f18_ayu_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f19_yamame.c b/src/data/model/act_f19_yamame.c new file mode 100644 index 00000000..e0fcce5e --- /dev/null +++ b/src/data/model/act_f19_yamame.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f19_yamame_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f19_yamame_pal.inc" +}; + +u8 act_f19_yamame_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f19_yamame_tex.inc" +}; + +Vtx act_f19_yamame_a_v[] = { +#include "assets/act_f19_yamame_a_v.inc" +}; + +Gfx act_f19_yamame_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f19_yamame_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f19_yamame_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f19_yamame_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f19_yamame_b_v[] = { +#include "assets/act_f19_yamame_b_v.inc" +}; + +Gfx act_f19_yamame_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f19_yamame_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f19_yamame_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f19_yamame_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f19_yamame_c_v[] = { +#include "assets/act_f19_yamame_c_v.inc" +}; + +Gfx act_f19_yamame_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f19_yamame_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f19_yamame_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f19_yamame_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 0, 3, 4), + gsSPNTriangles_5b(5, 0, 4, 4, 3, 6, 4, 6, 7, 4, 7, 8), + gsSPNTriangles_5b(5, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f20_iwana.c b/src/data/model/act_f20_iwana.c new file mode 100644 index 00000000..0397f8e8 --- /dev/null +++ b/src/data/model/act_f20_iwana.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f20_iwana_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f20_iwana_pal.inc" +}; + +u8 act_f20_iwana_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f20_iwana_tex.inc" +}; + +Vtx act_f20_iwana_a_v[] = { +#include "assets/act_f20_iwana_a_v.inc" +}; + +Gfx act_f20_iwana_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f20_iwana_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f20_iwana_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f20_iwana_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f20_iwana_b_v[] = { +#include "assets/act_f20_iwana_b_v.inc" +}; + +Gfx act_f20_iwana_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f20_iwana_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f20_iwana_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f20_iwana_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f20_iwana_c_v[] = { +#include "assets/act_f20_iwana_c_v.inc" +}; + +Gfx act_f20_iwana_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f20_iwana_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f20_iwana_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f20_iwana_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 3, 0, 2, 2, 1, 4), + gsSPNTriangles_5b(2, 4, 5, 2, 5, 6, 3, 2, 6, 0, 7, 8), + gsSPNTriangles_5b(0, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f21_niji.c b/src/data/model/act_f21_niji.c new file mode 100644 index 00000000..a1f206d2 --- /dev/null +++ b/src/data/model/act_f21_niji.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f21_niji_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f21_niji_pal.inc" +}; + +u8 act_f21_niji_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f21_niji_tex.inc" +}; + +Vtx act_f21_niji_a_v[] = { +#include "assets/act_f21_niji_a_v.inc" +}; + +Gfx act_f21_niji_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f21_niji_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f21_niji_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f21_niji_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f21_niji_b_v[] = { +#include "assets/act_f21_niji_b_v.inc" +}; + +Gfx act_f21_niji_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f21_niji_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f21_niji_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f21_niji_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f21_niji_c_v[] = { +#include "assets/act_f21_niji_c_v.inc" +}; + +Gfx act_f21_niji_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f21_niji_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f21_niji_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f21_niji_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 0, 3, 4), + gsSPNTriangles_5b(5, 0, 4, 4, 3, 6, 4, 6, 7, 4, 7, 8), + gsSPNTriangles_5b(5, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f22_ito.c b/src/data/model/act_f22_ito.c new file mode 100644 index 00000000..f727611e --- /dev/null +++ b/src/data/model/act_f22_ito.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f22_ito_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f22_ito_pal.inc" +}; + +u8 act_f22_ito_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f22_ito_tex.inc" +}; + +Vtx act_f22_ito_a_v[] = { +#include "assets/act_f22_ito_a_v.inc" +}; + +Gfx act_f22_ito_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f22_ito_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 32, act_f22_ito_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f22_ito_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f22_ito_b_v[] = { +#include "assets/act_f22_ito_b_v.inc" +}; + +Gfx act_f22_ito_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f22_ito_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 32, act_f22_ito_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f22_ito_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f22_ito_c_v[] = { +#include "assets/act_f22_ito_c_v.inc" +}; + +Gfx act_f22_ito_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f22_ito_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 32, act_f22_ito_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f22_ito_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 0, 3, 4), + gsSPNTriangles_5b(5, 0, 4, 4, 3, 6, 4, 6, 7, 4, 7, 8), + gsSPNTriangles_5b(5, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f23_sake.c b/src/data/model/act_f23_sake.c new file mode 100644 index 00000000..c597dd8c --- /dev/null +++ b/src/data/model/act_f23_sake.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f23_sake_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f23_sake_pal.inc" +}; + +u8 act_f23_sake_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f23_sake_tex.inc" +}; + +Vtx act_f23_sake_a_v[] = { +#include "assets/act_f23_sake_a_v.inc" +}; + +Gfx act_f23_sake_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f23_sake_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f23_sake_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f23_sake_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f23_sake_b_v[] = { +#include "assets/act_f23_sake_b_v.inc" +}; + +Gfx act_f23_sake_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f23_sake_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f23_sake_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f23_sake_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f23_sake_c_v[] = { +#include "assets/act_f23_sake_c_v.inc" +}; + +Gfx act_f23_sake_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f23_sake_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f23_sake_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f23_sake_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 3, 0, 2, 2, 1, 4), + gsSPNTriangles_5b(2, 4, 5, 2, 5, 6, 3, 2, 6, 0, 7, 8), + gsSPNTriangles_5b(0, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f24_kingyo.c b/src/data/model/act_f24_kingyo.c new file mode 100644 index 00000000..a3e7179e --- /dev/null +++ b/src/data/model/act_f24_kingyo.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f24_kingyo_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f24_kingyo_pal.inc" +}; + +u8 act_f24_kingyo_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f24_kingyo_tex.inc" +}; + +Vtx act_f24_kingyo_a_v[] = { +#include "assets/act_f24_kingyo_a_v.inc" +}; + +Gfx act_f24_kingyo_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f24_kingyo_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f24_kingyo_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f24_kingyo_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f24_kingyo_b_v[] = { +#include "assets/act_f24_kingyo_b_v.inc" +}; + +Gfx act_f24_kingyo_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f24_kingyo_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f24_kingyo_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f24_kingyo_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f24_kingyo_c_v[] = { +#include "assets/act_f24_kingyo_c_v.inc" +}; + +Gfx act_f24_kingyo_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f24_kingyo_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f24_kingyo_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f24_kingyo_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 0, 3, 4), + gsSPNTriangles_5b(5, 0, 4, 4, 3, 6, 4, 6, 7, 4, 7, 8), + gsSPNTriangles_5b(5, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f25_pirania.c b/src/data/model/act_f25_pirania.c new file mode 100644 index 00000000..7ea4833f --- /dev/null +++ b/src/data/model/act_f25_pirania.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f25_pirania_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f25_pirania_pal.inc" +}; + +u8 act_f25_pirania_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f25_pirania_tex.inc" +}; + +Vtx act_f25_pirania_a_v[] = { +#include "assets/act_f25_pirania_a_v.inc" +}; + +Gfx act_f25_pirania_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f25_pirania_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f25_pirania_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f25_pirania_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f25_pirania_b_v[] = { +#include "assets/act_f25_pirania_b_v.inc" +}; + +Gfx act_f25_pirania_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f25_pirania_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f25_pirania_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f25_pirania_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f25_pirania_c_v[] = { +#include "assets/act_f25_pirania_c_v.inc" +}; + +Gfx act_f25_pirania_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f25_pirania_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f25_pirania_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f25_pirania_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f26_aroana.c b/src/data/model/act_f26_aroana.c new file mode 100644 index 00000000..568a4912 --- /dev/null +++ b/src/data/model/act_f26_aroana.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f26_aroana_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f26_aroana_pal.inc" +}; + +u8 act_f26_aroana_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f26_aroana_tex.inc" +}; + +Vtx act_f26_aroana_a_v[] = { +#include "assets/act_f26_aroana_a_v.inc" +}; + +Gfx act_f26_aroana_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f26_aroana_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f26_aroana_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f26_aroana_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f26_aroana_b_v[] = { +#include "assets/act_f26_aroana_b_v.inc" +}; + +Gfx act_f26_aroana_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f26_aroana_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f26_aroana_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f26_aroana_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f26_aroana_c_v[] = { +#include "assets/act_f26_aroana_c_v.inc" +}; + +Gfx act_f26_aroana_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f26_aroana_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f26_aroana_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f26_aroana_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 3, 0, 2, 2, 1, 4), + gsSPNTriangles_5b(2, 4, 5, 2, 5, 6, 3, 2, 6, 0, 7, 8), + gsSPNTriangles_5b(0, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f27_unagi.c b/src/data/model/act_f27_unagi.c new file mode 100644 index 00000000..03b1985a --- /dev/null +++ b/src/data/model/act_f27_unagi.c @@ -0,0 +1,74 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + + +u16 act_f27_unagi_pal[] ATTRIBUTE_ALIGN(32)= { +#include "assets/act_f27_unagi_pal.inc" +}; + +u8 act_f27_unagi_tex[] ATTRIBUTE_ALIGN(32)= { +#include "assets/act_f27_unagi_tex.inc" +}; + +Vtx act_f27_unagi_a_v[] = { +#include "assets/act_f27_unagi_a_v.inc" +}; + +Gfx act_f27_unagi_aT_model[] = { +gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), +gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), +gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), +gsDPLoadTLUT_Dolphin(15, 16, 1, act_f27_unagi_pal), +gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 16, act_f27_unagi_tex), +gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), +gsDPSetPrimColor(0, 128, 255, 255, 255, 255), +gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), +gsSPVertex(act_f27_unagi_a_v, 9, 0), +gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), +gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), +gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), +gsSPEndDisplayList(), +}; + +Vtx act_f27_unagi_b_v[] = { +#include "assets/act_f27_unagi_b_v.inc" +}; + +Gfx act_f27_unagi_bT_model[] = { +gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), +gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), +gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), +gsDPLoadTLUT_Dolphin(15, 16, 1, act_f27_unagi_pal), +gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 16, act_f27_unagi_tex), +gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), +gsDPSetPrimColor(0, 128, 255, 255, 255, 255), +gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), +gsSPVertex(act_f27_unagi_b_v, 9, 0), +gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), +gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), +gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), +gsSPEndDisplayList(), +}; + +Vtx act_f27_unagi_c_v[] = { +#include "assets/act_f27_unagi_c_v.inc" +}; + +Gfx act_f27_unagi_cT_model[] = { +gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), +gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), +gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), +gsDPLoadTLUT_Dolphin(15, 16, 1, act_f27_unagi_pal), +gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 16, act_f27_unagi_tex), +gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), +gsDPSetPrimColor(0, 128, 255, 255, 255, 255), +gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), +gsSPVertex(act_f27_unagi_c_v, 9, 0), +gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), +gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), +gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), +gsSPEndDisplayList(), +}; + diff --git a/src/data/model/act_f28_akikan.c b/src/data/model/act_f28_akikan.c new file mode 100644 index 00000000..c45b008f --- /dev/null +++ b/src/data/model/act_f28_akikan.c @@ -0,0 +1,31 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f28_akikan_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f28_akikan_pal.inc" +}; + +u8 act_f28_akikan_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f28_akikan_tex.inc" +}; + +Vtx act_f28_akikan_v[] = { +#include "assets/act_f28_akikan_v.inc" +}; + +Gfx act_f28_akikanT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f28_akikan_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 16, act_f28_akikan_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f28_akikan_v, 6, 0), + gsSPNTrianglesInit_5b(5, 0, 1, 2, 1, 3, 2, 0, 4, 1), + gsSPNTriangles_5b(4, 5, 1, 5, 3, 1, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f28_donko.c b/src/data/model/act_f28_donko.c new file mode 100644 index 00000000..922ebee2 --- /dev/null +++ b/src/data/model/act_f28_donko.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f28_donko_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f28_donko_pal.inc" +}; + +u8 act_f28_donko_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f28_donko_tex.inc" +}; + +Vtx act_f28_donko_a_v[] = { +#include "assets/act_f28_donko_a_v.inc" +}; + +Gfx act_f28_donko_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f28_donko_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f28_donko_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f28_donko_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f28_donko_b_v[] = { +#include "assets/act_f28_donko_b_v.inc" +}; + +Gfx act_f28_donko_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f28_donko_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f28_donko_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f28_donko_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f28_donko_c_v[] = { +#include "assets/act_f28_donko_c_v.inc" +}; + +Gfx act_f28_donko_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f28_donko_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f28_donko_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f28_donko_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 0, 3, 4), + gsSPNTriangles_5b(5, 0, 4, 4, 3, 6, 4, 6, 7, 4, 7, 8), + gsSPNTriangles_5b(5, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f29_angel.c b/src/data/model/act_f29_angel.c new file mode 100644 index 00000000..c5b545a1 --- /dev/null +++ b/src/data/model/act_f29_angel.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f29_angel_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f29_angel_pal.inc" +}; + +u8 act_f29_angel_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f29_angel_tex.inc" +}; + +Vtx act_f29_angel_a_v[] = { +#include "assets/act_f29_angel_a_v.inc" +}; + +Gfx act_f29_angel_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f29_angel_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f29_angel_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f29_angel_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f29_angel_b_v[] = { +#include "assets/act_f29_angel_b_v.inc" +}; + +Gfx act_f29_angel_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f29_angel_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f29_angel_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f29_angel_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f29_angel_c_v[] = { +#include "assets/act_f29_angel_c_v.inc" +}; + +Gfx act_f29_angel_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f29_angel_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f29_angel_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f29_angel_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 0, 3, 4), + gsSPNTriangles_5b(5, 0, 4, 4, 3, 6, 4, 6, 7, 4, 7, 8), + gsSPNTriangles_5b(5, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f30_gupi.c b/src/data/model/act_f30_gupi.c new file mode 100644 index 00000000..6918c530 --- /dev/null +++ b/src/data/model/act_f30_gupi.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f30_gupi_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f30_gupi_pal.inc" +}; + +u8 act_f30_gupi_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f30_gupi_tex.inc" +}; + +Vtx act_f30_gupi_a_v[] = { +#include "assets/act_f30_gupi_a_v.inc" +}; + +Gfx act_f30_gupi_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f30_gupi_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f30_gupi_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f30_gupi_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f30_gupi_b_v[] = { +#include "assets/act_f30_gupi_b_v.inc" +}; + +Gfx act_f30_gupi_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f30_gupi_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f30_gupi_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f30_gupi_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f30_gupi_c_v[] = { +#include "assets/act_f30_gupi_c_v.inc" +}; + +Gfx act_f30_gupi_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f30_gupi_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f30_gupi_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f30_gupi_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 0, 3, 4), + gsSPNTriangles_5b(5, 0, 4, 4, 3, 6, 4, 6, 7, 4, 7, 8), + gsSPNTriangles_5b(5, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f30_nagagutu.c b/src/data/model/act_f30_nagagutu.c new file mode 100644 index 00000000..2cc053d1 --- /dev/null +++ b/src/data/model/act_f30_nagagutu.c @@ -0,0 +1,31 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f30_nagagutu_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f30_nagagutu_pal.inc" +}; + +u8 act_f30_nagagutu_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f30_nagagutu_tex.inc" +}; + +Vtx act_f30_nagagutu_v[] = { +#include "assets/act_f30_nagagutu_v.inc" +}; + +Gfx act_f30_nagagutuT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f30_nagagutu_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f30_nagagutu_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f30_nagagutu_v, 5, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 1, 3, 2, 0, 4, 1), + gsSPNTriangles_5b(4, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f31_demekin.c b/src/data/model/act_f31_demekin.c new file mode 100644 index 00000000..79d0286c --- /dev/null +++ b/src/data/model/act_f31_demekin.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f31_demekin_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f31_demekin_pal.inc" +}; + +u8 act_f31_demekin_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f31_demekin_tex.inc" +}; + +Vtx act_f31_demekin_a_v[] = { +#include "assets/act_f31_demekin_a_v.inc" +}; + +Gfx act_f31_demekin_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f31_demekin_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f31_demekin_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f31_demekin_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f31_demekin_b_v[] = { +#include "assets/act_f31_demekin_b_v.inc" +}; + +Gfx act_f31_demekin_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f31_demekin_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f31_demekin_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f31_demekin_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 0, 3, 4), + gsSPNTriangles_5b(5, 0, 4, 4, 3, 6, 4, 6, 7, 4, 7, 8), + gsSPNTriangles_5b(5, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f31_demekin_c_v[] = { +#include "assets/act_f31_demekin_c_v.inc" +}; + +Gfx act_f31_demekin_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f31_demekin_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_f31_demekin_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f31_demekin_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 6, 1, 6, 5, 1, 6, 7, 8), + gsSPNTriangles_5b(6, 8, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f31_taiya.c b/src/data/model/act_f31_taiya.c new file mode 100644 index 00000000..88164bd0 --- /dev/null +++ b/src/data/model/act_f31_taiya.c @@ -0,0 +1,31 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f31_taiya_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f31_taiya_pal.inc" +}; + +u8 act_f31_taiya_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f31_taiya_tex.inc" +}; + +Vtx act_f31_taiya_v[] = { +#include "assets/act_f31_taiya_v.inc" +}; + +Gfx act_f29_petT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f31_taiya_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f31_taiya_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f31_taiya_v, 5, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 1, 3, 2, 0, 4, 1), + gsSPNTriangles_5b(4, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f32_kaseki.c b/src/data/model/act_f32_kaseki.c new file mode 100644 index 00000000..963aef45 --- /dev/null +++ b/src/data/model/act_f32_kaseki.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 act_f32_kaseki_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f32_kaseki_pal.inc" +}; + +u8 act_f32_kaseki_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f32_kaseki_tex.inc" +}; + +Vtx act_f32_kaseki_a_v[] = { +#include "assets/act_f32_kaseki_a_v.inc" +}; + +Gfx act_f32_kaseki_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f32_kaseki_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 32, act_f32_kaseki_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f32_kaseki_a_v, 10, 0), + gsSPNTrianglesInit_5b(10, 0, 1, 2, 2, 1, 3, 0, 2, 4), + gsSPNTriangles_5b(2, 5, 4, 2, 3, 5, 1, 6, 3, 0, 7, 1), + gsSPNTriangles_5b(7, 6, 1, 7, 8, 9, 7, 9, 6, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f32_kaseki_b_v[] = { +#include "assets/act_f32_kaseki_b_v.inc" +}; + +Gfx act_f32_kasekiT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f32_kaseki_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 32, act_f32_kaseki_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f32_kaseki_b_v, 10, 0), + gsSPNTrianglesInit_5b(10, 0, 1, 2, 2, 1, 3, 0, 2, 4), + gsSPNTriangles_5b(2, 5, 4, 2, 3, 5, 1, 6, 3, 0, 7, 1), + gsSPNTriangles_5b(7, 6, 1, 7, 8, 9, 7, 9, 6, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f32_kaseki_c_v[] = { +#include "assets/act_f32_kaseki_c_v.inc" +}; + +Gfx act_f32_kaseki_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f32_kaseki_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 32, act_f32_kaseki_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f32_kaseki_c_v, 10, 0), + gsSPNTrianglesInit_5b(10, 0, 1, 2, 3, 1, 0, 4, 5, 6), + gsSPNTriangles_5b(4, 6, 7, 4, 7, 1, 3, 4, 1, 1, 7, 2), + gsSPNTriangles_5b(0, 2, 8, 0, 8, 9, 3, 0, 9, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f33_medaka.c b/src/data/model/act_f33_medaka.c new file mode 100644 index 00000000..9b948075 --- /dev/null +++ b/src/data/model/act_f33_medaka.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +static u16 int_nog_medaka_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f33_medaka/int_nog_medaka_pal.inc" +}; + +u8 act_f33_medaka_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f33_medaka_tex.inc" +}; + +Vtx act_f33_medaka_a_v[] = { +#include "assets/act_f33_medaka_a_v.inc" +}; + +Gfx act_f33_medaka_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, int_nog_medaka_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 16, act_f33_medaka_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f33_medaka_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 3, 4, 5), + gsSPNTriangles_5b(4, 6, 5, 6, 7, 5, 7, 8, 5, 8, 0, 5), + gsSPNTriangles_5b(0, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f33_medaka_b_v[] = { +#include "assets/act_f33_medaka_b_v.inc" +}; + +Gfx act_f33_medaka_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, int_nog_medaka_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 16, act_f33_medaka_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f33_medaka_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 3, 4, 5), + gsSPNTriangles_5b(4, 6, 5, 6, 7, 5, 7, 8, 5, 8, 0, 5), + gsSPNTriangles_5b(0, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f33_medaka_c_v[] = { +#include "assets/act_f33_medaka_c_v.inc" +}; + +Gfx act_f33_medaka_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, int_nog_medaka_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 16, act_f33_medaka_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f33_medaka_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 3, 4, 5), + gsSPNTriangles_5b(4, 6, 5, 6, 7, 5, 7, 8, 5, 8, 0, 5), + gsSPNTriangles_5b(0, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f34_piraluku.c b/src/data/model/act_f34_piraluku.c new file mode 100644 index 00000000..a42fb382 --- /dev/null +++ b/src/data/model/act_f34_piraluku.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +static u16 int_nog_piraluku_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f34_piraluku/int_nog_piraluku_pal.inc" +}; + +u8 act_f34_piraluku_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f34_piraluku_tex.inc" +}; + +Vtx act_f34_piraluku_a_v[] = { +#include "assets/act_f34_piraluku_a_v.inc" +}; + +Gfx act_f34_piraluku_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, int_nog_piraluku_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 32, act_f34_piraluku_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f34_piraluku_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 3, 2, 4, 3, 4, 5), + gsSPNTriangles_5b(0, 6, 1, 6, 7, 1, 7, 8, 1, 8, 4, 1), + gsSPNTriangles_5b(1, 4, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f34_piraluku_b_v[] = { +#include "assets/act_f34_piraluku_b_v.inc" +}; + +Gfx act_f34_piraluku_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, int_nog_piraluku_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 32, act_f34_piraluku_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f34_piraluku_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 3, 2, 4, 3, 4, 5), + gsSPNTriangles_5b(0, 6, 1, 6, 7, 1, 7, 8, 1, 8, 4, 1), + gsSPNTriangles_5b(1, 4, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f34_piraluku_c_v[] = { +#include "assets/act_f34_piraluku_c_v.inc" +}; + +Gfx act_f34_piraluku_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, int_nog_piraluku_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 32, act_f34_piraluku_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f34_piraluku_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 3, 2, 4, 3, 4, 5), + gsSPNTriangles_5b(0, 6, 1, 6, 7, 1, 7, 8, 1, 8, 4, 1), + gsSPNTriangles_5b(1, 4, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f35_zarigani.c b/src/data/model/act_f35_zarigani.c new file mode 100644 index 00000000..3858d2e3 --- /dev/null +++ b/src/data/model/act_f35_zarigani.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +static u16 int_nog_zarigani_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f35_zarigani/int_nog_zarigani_pal.inc" +}; + +u8 act_f35_zarigani_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f35_zarigani_tex.inc" +}; + +Vtx act_f35_zarigani_a_v[] = { +#include "assets/act_f35_zarigani_a_v.inc" +}; + +Gfx act_f35_zarigani_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, int_nog_zarigani_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 32, act_f35_zarigani_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f35_zarigani_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 3, 4, 5, 3, 5, 6), + gsSPNTriangles_5b(5, 0, 6, 0, 7, 6, 0, 2, 7, 0, 8, 1), + gsSPNTriangles_5b(0, 5, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f35_zarigani_b_v[] = { +#include "assets/act_f35_zarigani_b_v.inc" +}; + +Gfx act_f35_zarigani_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, int_nog_zarigani_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 32, act_f35_zarigani_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f35_zarigani_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 3, 4, 5, 3, 5, 6), + gsSPNTriangles_5b(5, 0, 6, 0, 7, 6, 0, 2, 7, 0, 8, 1), + gsSPNTriangles_5b(0, 5, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f35_zarigani_c_v[] = { +#include "assets/act_f35_zarigani_c_v.inc" +}; + +Gfx act_f35_zarigani_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, int_nog_zarigani_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 32, act_f35_zarigani_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f35_zarigani_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 3, 4, 5, 3, 5, 6), + gsSPNTriangles_5b(5, 0, 6, 0, 7, 6, 0, 2, 7, 0, 8, 1), + gsSPNTriangles_5b(0, 5, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f36_kaeru.c b/src/data/model/act_f36_kaeru.c new file mode 100644 index 00000000..c98ac391 --- /dev/null +++ b/src/data/model/act_f36_kaeru.c @@ -0,0 +1,69 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +static u16 int_nog_kaeru_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f36_kaeru/int_nog_kaeru_pal.inc" +}; + +u8 act_f36_kaeru_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f36_kaeru_tex.inc" +}; + +Vtx act_f36_kaeru_a_v[] = { +#include "assets/act_f36_kaeru_a_v.inc" +}; + +Gfx act_f36_kaeru_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, int_nog_kaeru_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 128, act_f36_kaeru_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f36_kaeru_a_v, 8, 0), + gsSPNTrianglesInit_5b(7, 0, 1, 2, 0, 3, 1, 1, 4, 2), + gsSPNTriangles_5b(2, 5, 6, 6, 7, 0, 2, 6, 0, 0, 7, 3), + gsSPEndDisplayList(), +}; + +Vtx act_f36_kaeru_b_v[] = { +#include "assets/act_f36_kaeru_b_v.inc" +}; + +Gfx act_f36_kaeru_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, int_nog_kaeru_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 128, act_f36_kaeru_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f36_kaeru_b_v, 8, 0), + gsSPNTrianglesInit_5b(7, 0, 1, 2, 3, 4, 0, 4, 1, 0), + gsSPNTriangles_5b(3, 5, 4, 6, 7, 3, 0, 2, 6, 0, 6, 3), + gsSPEndDisplayList(), +}; + +Vtx act_f36_kaeru_c_v[] = { +#include "assets/act_f36_kaeru_c_v.inc" +}; + +Gfx act_f36_kaeru_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, int_nog_kaeru_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 128, act_f36_kaeru_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f36_kaeru_c_v, 8, 0), + gsSPNTrianglesInit_5b(7, 0, 1, 2, 3, 4, 0, 4, 1, 0), + gsSPNTriangles_5b(3, 5, 4, 6, 7, 3, 0, 2, 6, 0, 6, 3), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f37_kurage.c b/src/data/model/act_f37_kurage.c new file mode 100644 index 00000000..3edb0098 --- /dev/null +++ b/src/data/model/act_f37_kurage.c @@ -0,0 +1,85 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +static u16 act_f37_kurage_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f37_kurage/act_f37_kurage_pal.inc" +}; + +u8 act_f37_kurage_head_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f37_kurage_head_tex.inc" +}; + +u8 act_f37_kurage_foot_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f37_kurage_foot_tex.inc" +}; + +Vtx act_f37_kurage_a_v[] = { +#include "assets/act_f37_kurage_a_v.inc" +}; + +Gfx act_f37_kurage_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 180), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f37_kurage_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 32, act_f37_kurage_foot_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f37_kurage_a_v, 13, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 3, 4, 0, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 32, act_f37_kurage_head_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPNTrianglesInit_5b(10, 5, 6, 7, 7, 8, 5, 9, 7, 6), + gsSPNTriangles_5b(6, 10, 9, 11, 9, 10, 10, 12, 11, 12, 5, 8), + gsSPNTriangles_5b(8, 11, 12, 9, 8, 7, 9, 11, 8, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f37_kurage_b_v[] = { +#include "assets/act_f37_kurage_b_v.inc" +}; + +Gfx act_f37_kurage_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f37_kurage_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 32, act_f37_kurage_foot_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f37_kurage_b_v, 13, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 3, 4, 0, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 32, act_f37_kurage_head_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPNTrianglesInit_5b(10, 5, 6, 7, 7, 8, 5, 9, 7, 6), + gsSPNTriangles_5b(6, 10, 9, 11, 9, 10, 10, 12, 11, 12, 5, 8), + gsSPNTriangles_5b(8, 11, 12, 9, 8, 7, 9, 11, 8, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f37_kurage_c_v[] = { +#include "assets/act_f37_kurage_c_v.inc" +}; + +Gfx act_f37_kurage_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_f37_kurage_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 32, act_f37_kurage_foot_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f37_kurage_c_v, 13, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 3, 4, 0, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 32, act_f37_kurage_head_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPNTrianglesInit_5b(10, 5, 6, 7, 7, 8, 5, 9, 7, 6), + gsSPNTriangles_5b(6, 10, 9, 11, 9, 10, 10, 12, 11, 12, 5, 8), + gsSPNTriangles_5b(8, 11, 12, 9, 8, 7, 9, 11, 8, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f38_suzuki.c b/src/data/model/act_f38_suzuki.c new file mode 100644 index 00000000..56e614a8 --- /dev/null +++ b/src/data/model/act_f38_suzuki.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +static u16 int_nog_suzuki_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f38_suzuki/int_nog_suzuki_pal.inc" +}; + +u8 act_f38_suzuki_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f38_suzuki_tex.inc" +}; + +Vtx act_f38_suzuki_a_v[] = { +#include "assets/act_f38_suzuki_a_v.inc" +}; + +Gfx act_f38_suzuki_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, int_nog_suzuki_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f38_suzuki_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f38_suzuki_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 3, 4, 2), + gsSPNTriangles_5b(4, 5, 2, 5, 6, 2, 4, 7, 8, 4, 8, 5), + gsSPNTriangles_5b(0, 2, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f38_suzuki_b_v[] = { +#include "assets/act_f38_suzuki_b_v.inc" +}; + +Gfx act_f38_suzuki_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, int_nog_suzuki_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f38_suzuki_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f38_suzuki_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 3, 4, 2), + gsSPNTriangles_5b(4, 5, 2, 5, 6, 2, 4, 7, 8, 4, 8, 5), + gsSPNTriangles_5b(0, 2, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f38_suzuki_c_v[] = { +#include "assets/act_f38_suzuki_c_v.inc" +}; + +Gfx act_f38_suzuki_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, int_nog_suzuki_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f38_suzuki_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f38_suzuki_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 1, 3, 2, 3, 4, 2), + gsSPNTriangles_5b(4, 5, 2, 5, 6, 2, 4, 7, 8, 4, 8, 5), + gsSPNTriangles_5b(0, 2, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f39_tai.c b/src/data/model/act_f39_tai.c new file mode 100644 index 00000000..c2877085 --- /dev/null +++ b/src/data/model/act_f39_tai.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +static u16 int_nog_tai_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f39_tai/int_nog_tai_pal.inc" +}; + +u8 act_f39_tai_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f39_tai_tex.inc" +}; + +Vtx act_f39_tai_a_v[] = { +#include "assets/act_f39_tai_a_v.inc" +}; + +Gfx act_f39_tai_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, int_nog_tai_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f39_tai_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f39_tai_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 3, 4, 5), + gsSPNTriangles_5b(4, 6, 5, 6, 7, 5, 7, 8, 5, 8, 0, 5), + gsSPNTriangles_5b(0, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f39_tai_b_v[] = { +#include "assets/act_f39_tai_b_v.inc" +}; + +Gfx act_f39_tai_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, int_nog_tai_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f39_tai_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f39_tai_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 3, 4, 5), + gsSPNTriangles_5b(4, 6, 5, 6, 7, 5, 7, 8, 5, 8, 0, 5), + gsSPNTriangles_5b(0, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f39_tai_c_v[] = { +#include "assets/act_f39_tai_c_v.inc" +}; + +Gfx act_f39_tai_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, int_nog_tai_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f39_tai_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f39_tai_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 3, 4, 5), + gsSPNTriangles_5b(4, 6, 5, 6, 7, 5, 7, 8, 5, 8, 0, 5), + gsSPNTriangles_5b(0, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_f40_isidai.c b/src/data/model/act_f40_isidai.c new file mode 100644 index 00000000..702d20ec --- /dev/null +++ b/src/data/model/act_f40_isidai.c @@ -0,0 +1,72 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +static u16 int_nog_isidai_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f40_isidai/int_nog_isidai_pal.inc" +}; + +u8 act_f40_isidai_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_f40_isidai_tex.inc" +}; + +Vtx act_f40_isidai_a_v[] = { +#include "assets/act_f40_isidai_a_v.inc" +}; + +Gfx act_f40_isidai_aT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, int_nog_isidai_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f40_isidai_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f40_isidai_a_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 3, 4, 5), + gsSPNTriangles_5b(4, 6, 5, 6, 7, 5, 7, 8, 5, 8, 0, 5), + gsSPNTriangles_5b(0, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f40_isidai_b_v[] = { +#include "assets/act_f40_isidai_b_v.inc" +}; + +Gfx act_f40_isidai_bT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, int_nog_isidai_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f40_isidai_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f40_isidai_b_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 3, 4, 5), + gsSPNTriangles_5b(4, 6, 5, 6, 7, 5, 7, 8, 5, 8, 0, 5), + gsSPNTriangles_5b(0, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Vtx act_f40_isidai_c_v[] = { +#include "assets/act_f40_isidai_c_v.inc" +}; + +Gfx act_f40_isidai_cT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, int_nog_isidai_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 48, 32, act_f40_isidai_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_f40_isidai_c_v, 9, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 0, 2, 3, 3, 4, 5), + gsSPNTriangles_5b(4, 6, 5, 6, 7, 5, 7, 8, 5, 8, 0, 5), + gsSPNTriangles_5b(0, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_gyoei02.c b/src/data/model/act_gyoei02.c new file mode 100644 index 00000000..5b06c859 --- /dev/null +++ b/src/data/model/act_gyoei02.c @@ -0,0 +1,39 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u8 act_gyoei02_0_int_i4[] = { +#include "assets/act_gyoei02_0_int_i4.inc" +}; + +u8 act_gyoei02_1_int_i4[] = { +#include "assets/act_gyoei02_1_int_i4.inc" +}; + +u8 act_gyoei02_2_int_i4[] = { +#include "assets/act_gyoei02_2_int_i4.inc" +}; + +u8 act_gyoei02_3_int_i4[] = { +#include "assets/act_gyoei02_3_int_i4.inc" +}; + +Vtx act_gyoei02_00_v[] = { +#include "assets/act_gyoei02_00_v.inc" +}; + +Gfx act_gyoei02_00_modelT[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(0, 0, 0, PRIMITIVE, TEXEL1, TEXEL0, PRIM_LOD_FRAC, TEXEL0, 0, 0, 0, COMBINED, COMBINED, 0, + PRIMITIVE, 0), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPSetTextureImage_Dolphin(G_IM_FMT_I, G_IM_SIZ_4b, 32, 16, anime_1_txt), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_MIRROR, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_I, G_IM_SIZ_4b, 32, 16, anime_2_txt), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 1, 15, GX_MIRROR, GX_MIRROR, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_gyoei02_00_v, 4, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 1, 3, 2, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_abura.c b/src/data/model/act_m_abura.c new file mode 100644 index 00000000..72f4bfdb --- /dev/null +++ b/src/data/model/act_m_abura.c @@ -0,0 +1,64 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_abura_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_abura/act_m_abura_pal.inc" +}; + +static u8 act_m_abura[] = { +#include "assets/act_m_abura/act_m_abura.inc" +}; + +static Vtx act_m_abura_v[] = { +#include "assets/act_m_abura/act_m_abura_v.inc" +}; + +Gfx act_m_abura1_1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_abura_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_abura), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_MIRROR, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_abura_v, 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 1, 4, 5), + gsSPNTriangles_5b(1, 5, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_abura1_2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, SHADE, 0, COMBINED, 0, + ENVIRONMENT, 0), + gsDPSetPrimColor(0, 255, 255, 255, 255, 200), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_abura_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_abura), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_MIRROR, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_abura_v[6], 8, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 5, 6), + gsSPNTriangles_5b(4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_abura2_2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, SHADE, 0, COMBINED, 0, + ENVIRONMENT, 0), + gsDPSetPrimColor(0, 255, 255, 255, 255, 200), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_abura_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_abura), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_MIRROR, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_abura_v[14], 8, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 5, 6), + gsSPNTriangles_5b(4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_akiakane.c b/src/data/model/act_m_akiakane.c new file mode 100644 index 00000000..458bcb87 --- /dev/null +++ b/src/data/model/act_m_akiakane.c @@ -0,0 +1,64 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_akiakane_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_akiakane/act_m_akiakane_pal.inc" +}; + +static u8 act_m_akiakane[] = { +#include "assets/act_m_akiakane/act_m_akiakane.inc" +}; + +static Vtx act_m_akiakane_v[] = { +#include "assets/act_m_akiakane/act_m_akiakane_v.inc" +}; + +Gfx act_m_akiakane1_1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_akiakane_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 48, act_m_akiakane), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_akiakane_v, 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 1, 4, 5), + gsSPNTriangles_5b(1, 5, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_akiakane1_2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, SHADE, 0, COMBINED, 0, + ENVIRONMENT, 0), + gsDPSetPrimColor(0, 255, 255, 255, 255, 160), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_akiakane_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 48, act_m_akiakane), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_akiakane_v[6], 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 2, 1), + gsSPNTriangles_5b(4, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_akiakane2_2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, SHADE, 0, COMBINED, 0, + ENVIRONMENT, 0), + gsDPSetPrimColor(0, 255, 255, 255, 255, 160), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_akiakane_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 48, act_m_akiakane), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_akiakane_v[12], 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 2, 1), + gsSPNTriangles_5b(4, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_amenbo.c b/src/data/model/act_m_amenbo.c new file mode 100644 index 00000000..527e4c3d --- /dev/null +++ b/src/data/model/act_m_amenbo.c @@ -0,0 +1,47 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_amenbo_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_amenbo/act_m_amenbo_pal.inc" +}; + +static u8 act_m_amenbo_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_amenbo/act_m_amenbo_tex.inc" +}; + +static Vtx act_m_amenbo_v[] = { +#include "assets/act_m_amenbo/act_m_amenbo_v.inc" +}; + +Gfx act_m_amenbo1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_amenbo_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 48, act_m_amenbo_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_amenbo_v, 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 1, 3, 2, 1, 4, 3), + gsSPNTriangles_5b(1, 5, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_amenbo2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_amenbo_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 48, act_m_amenbo_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_amenbo_v[6], 8, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 5, 6), + gsSPNTriangles_5b(4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_ari.c b/src/data/model/act_m_ari.c new file mode 100644 index 00000000..821a2f42 --- /dev/null +++ b/src/data/model/act_m_ari.c @@ -0,0 +1,32 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_ari_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_ari/act_m_ari_pal.inc" +}; + +static u8 act_m_ari_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_ari/act_m_ari_tex.inc" +}; + +static Vtx act_m_ari_v[] = { +#include "assets/act_m_ari/act_m_ari_v.inc" +}; + +Gfx act_m_ariT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_ari_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 32, act_m_ari_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_ari_v, 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 1, 4, 5), + gsSPNTriangles_5b(1, 5, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_dango.c b/src/data/model/act_m_dango.c new file mode 100644 index 00000000..048946f1 --- /dev/null +++ b/src/data/model/act_m_dango.c @@ -0,0 +1,47 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_dango_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_dango/act_m_dango_pal.inc" +}; + +static u8 act_m_dango_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_dango/act_m_dango_tex.inc" +}; + +static Vtx act_m_dango_v[] = { +#include "assets/act_m_dango/act_m_dango_v.inc" +}; + +Gfx act_m_dango1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_dango_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 48, act_m_dango_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_dango_v, 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 3, 2, 4), + gsSPNTriangles_5b(3, 4, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_dango2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_dango_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 48, act_m_dango_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_dango_v[6], 5, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 3, 1, 3, 4, 1), + gsSPNTriangles_5b(1, 4, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_danna.c b/src/data/model/act_m_danna.c new file mode 100644 index 00000000..c0338b2a --- /dev/null +++ b/src/data/model/act_m_danna.c @@ -0,0 +1,47 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_danna_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_danna/act_m_danna_pal.inc" +}; + +static u8 act_m_danna[] = { +#include "assets/act_m_danna/act_m_danna.inc" +}; + +static Vtx act_m_danna_v[] = { +#include "assets/act_m_danna/act_m_danna_v.inc" +}; + +Gfx act_m_danna1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_danna_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_danna), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_danna_v, 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 1, 4, 5), + gsSPNTriangles_5b(1, 5, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_danna2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_danna_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_danna), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_danna_v[6], 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 0, 3), + gsSPNTriangles_5b(4, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_genji2.c b/src/data/model/act_m_genji2.c new file mode 100644 index 00000000..9a776c1c --- /dev/null +++ b/src/data/model/act_m_genji2.c @@ -0,0 +1,73 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u8 act_m_genji_h1_txt[] = { +#include "assets/act_m_genji2/act_m_genji_h1_txt.inc" +}; + +static Vtx act_m_genji2_v[] = { +#include "assets/act_m_genji2/act_m_genji2_v.inc" +}; + +Gfx act_m_genji2_d_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, COMBINED, 0, 0, + 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 50, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPSetTextureImage_Dolphin(G_IM_FMT_I, G_IM_SIZ_4b, 32, 32, act_m_genji_h1_txt), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_MIRROR, 0, 0), + gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 252, 252), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_genji2_v, 4, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_genji2_c_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, COMBINED, 0, 0, + 0, COMBINED), + gsDPSetPrimColor(0, 255, 225, 225, 50, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPSetTextureImage_Dolphin(G_IM_FMT_I, G_IM_SIZ_4b, 32, 32, act_m_genji_h1_txt), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_MIRROR, 0, 0), + gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 252, 252), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_genji2_v[4], 4, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_genji2_b_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, COMBINED, 0, 0, + 0, COMBINED), + gsDPSetPrimColor(0, 255, 225, 225, 50, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPSetTextureImage_Dolphin(G_IM_FMT_I, G_IM_SIZ_4b, 32, 32, act_m_genji_h1_txt), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_MIRROR, 0, 0), + gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 252, 252), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_genji2_v[8], 4, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_genji2_a_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, COMBINED, 0, 0, + 0, COMBINED), + gsDPSetPrimColor(0, 255, 225, 225, 50, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPSetTextureImage_Dolphin(G_IM_FMT_I, G_IM_SIZ_4b, 32, 32, act_m_genji_h1_txt), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_MIRROR, 0, 0), + gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 252, 252), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_genji2_v[12], 4, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_ginyanma.c b/src/data/model/act_m_ginyanma.c new file mode 100644 index 00000000..29c5eb54 --- /dev/null +++ b/src/data/model/act_m_ginyanma.c @@ -0,0 +1,64 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_ginyanma_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_ginyanma/act_m_ginyanma_pal.inc" +}; + +static u8 act_m_ginyanma[] = { +#include "assets/act_m_ginyanma/act_m_ginyanma.inc" +}; + +static Vtx act_m_ginyanma_v[] = { +#include "assets/act_m_ginyanma/act_m_ginyanma_v.inc" +}; + +Gfx act_m_ginyanma1_1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_ginyanma_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 48, act_m_ginyanma), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_ginyanma_v, 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 1, 4, 5), + gsSPNTriangles_5b(1, 5, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_ginyanma1_2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, SHADE, 0, COMBINED, 0, + ENVIRONMENT, 0), + gsDPSetPrimColor(0, 255, 255, 255, 255, 160), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_ginyanma_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 48, act_m_ginyanma), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_ginyanma_v[6], 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 2, 1), + gsSPNTriangles_5b(4, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_ginyanma2_2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, SHADE, 0, COMBINED, 0, + ENVIRONMENT, 0), + gsDPSetPrimColor(0, 255, 255, 255, 255, 160), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_ginyanma_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 48, act_m_ginyanma), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_ginyanma_v[12], 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 2, 1), + gsSPNTriangles_5b(4, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_gomadara.c b/src/data/model/act_m_gomadara.c new file mode 100644 index 00000000..949cb9f9 --- /dev/null +++ b/src/data/model/act_m_gomadara.c @@ -0,0 +1,47 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_gomadara_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_gomadara/act_m_gomadara_pal.inc" +}; + +static u8 act_m_gomadara[] = { +#include "assets/act_m_gomadara/act_m_gomadara.inc" +}; + +static Vtx act_m_gomadara_v[] = { +#include "assets/act_m_gomadara/act_m_gomadara_v.inc" +}; + +Gfx act_m_gomadara1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_gomadara_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_gomadara), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_gomadara_v, 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 1, 4, 5), + gsSPNTriangles_5b(1, 5, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_gomadara2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_gomadara_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_gomadara), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_gomadara_v[6], 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 0, 3), + gsSPNTriangles_5b(4, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_hachi.c b/src/data/model/act_m_hachi.c new file mode 100644 index 00000000..7f571898 --- /dev/null +++ b/src/data/model/act_m_hachi.c @@ -0,0 +1,64 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_hachi_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_hachi/act_m_hachi_pal.inc" +}; + +static u8 act_m_hachi[] = { +#include "assets/act_m_hachi/act_m_hachi.inc" +}; + +static Vtx act_m_hachi_v[] = { +#include "assets/act_m_hachi/act_m_hachi_v.inc" +}; + +Gfx act_m_hachi1_1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_hachi_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_hachi), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_hachi_v, 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 1, 4, 5), + gsSPNTriangles_5b(1, 5, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_hachi1_2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, SHADE, 0, COMBINED, 0, + ENVIRONMENT, 0), + gsDPSetPrimColor(0, 255, 255, 255, 255, 120), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_hachi_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_hachi), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_hachi_v[6], 8, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 5, 6), + gsSPNTriangles_5b(4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_hachi2_2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, SHADE, 0, COMBINED, 0, + ENVIRONMENT, 0), + gsDPSetPrimColor(0, 255, 255, 255, 255, 120), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_hachi_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_hachi), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_hachi_v[14], 8, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 5, 6), + gsSPNTriangles_5b(4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_higurashi.c b/src/data/model/act_m_higurashi.c new file mode 100644 index 00000000..3a77387b --- /dev/null +++ b/src/data/model/act_m_higurashi.c @@ -0,0 +1,64 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_higurashi_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_higurashi/act_m_higurashi_pal.inc" +}; + +static u8 act_m_higurashi[] = { +#include "assets/act_m_higurashi/act_m_higurashi.inc" +}; + +static Vtx act_m_higurashi_v[] = { +#include "assets/act_m_higurashi/act_m_higurashi_v.inc" +}; + +Gfx act_m_higurashi1_1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_higurashi_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_higurashi), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_higurashi_v, 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 1, 4, 5), + gsSPNTriangles_5b(1, 5, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_higurashi1_2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, SHADE, 0, COMBINED, 0, + ENVIRONMENT, 0), + gsDPSetPrimColor(0, 255, 255, 255, 255, 160), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_higurashi_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_higurashi), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_higurashi_v[6], 8, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 5, 6), + gsSPNTriangles_5b(4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_higurashi2_2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, SHADE, 0, COMBINED, 0, + ENVIRONMENT, 0), + gsDPSetPrimColor(0, 255, 255, 255, 255, 160), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_higurashi_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_higurashi), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_higurashi_v[14], 8, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 5, 6), + gsSPNTriangles_5b(4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_hirata.c b/src/data/model/act_m_hirata.c new file mode 100644 index 00000000..ed5fceff --- /dev/null +++ b/src/data/model/act_m_hirata.c @@ -0,0 +1,47 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_hirata_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_hirata/act_m_hirata_pal.inc" +}; + +static u8 act_m_hirata[] = { +#include "assets/act_m_hirata/act_m_hirata.inc" +}; + +static Vtx act_m_hirata_v[] = { +#include "assets/act_m_hirata/act_m_hirata_v.inc" +}; + +Gfx act_m_hirata1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_hirata_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_hirata), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_hirata_v, 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 1, 4, 5), + gsSPNTriangles_5b(1, 5, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_hirata2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_hirata_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_hirata), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_hirata_v[6], 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 0, 3), + gsSPNTriangles_5b(4, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_hitodama.c b/src/data/model/act_m_hitodama.c new file mode 100644 index 00000000..6a5903c4 --- /dev/null +++ b/src/data/model/act_m_hitodama.c @@ -0,0 +1,43 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +u8 act_m_hitodama_h2_txt[] = { +#include "assets/act_m_hitodama_h2_txt.inc" +}; + +u8 act_m_hitodama_h1_txt[] = { +#include "assets/act_m_hitodama_h1_txt.inc" +}; + +Vtx act_m_hitodama_v[] = { +#include "assets/act_m_hitodama_v.inc" +}; + +Gfx act_m_hitodama_b_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 165, 165, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPSetTextureImage_Dolphin(G_IM_FMT_I, G_IM_SIZ_4b, 32, 32, act_m_hitodama_h2_txt), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_hitodama_v, 4, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_hitodama_a_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 195, 195, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_INTER2), + gsDPSetTextureImage_Dolphin(G_IM_FMT_I, G_IM_SIZ_4b, 32, 32, act_m_hitodama_h1_txt), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_hitodama_v[4], 4, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_house_goki.c b/src/data/model/act_m_house_goki.c new file mode 100644 index 00000000..869aa154 --- /dev/null +++ b/src/data/model/act_m_house_goki.c @@ -0,0 +1,47 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +u16 act_m_house_goki_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_house_goki_pal.inc" +}; + +u8 act_m_house_goki[] = { +#include "assets/act_m_house_goki.inc" +}; + +Vtx act_m_house_goki_v[] = { +#include "assets/act_m_house_goki_v.inc" +}; + +Gfx act_m_house_goki1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_house_goki_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_house_goki), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_house_goki_v, 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 1, 4, 5), + gsSPNTriangles_5b(1, 5, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_house_goki2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_house_goki_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_house_goki), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_house_goki_v[6], 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 0, 3), + gsSPNTriangles_5b(4, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_ka.c b/src/data/model/act_m_ka.c new file mode 100644 index 00000000..b2f88e21 --- /dev/null +++ b/src/data/model/act_m_ka.c @@ -0,0 +1,62 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_ka_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_ka/act_m_ka_pal.inc" +}; + +static u8 act_m_ka_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_ka/act_m_ka_tex.inc" +}; + +static Vtx act_m_ka_v[] = { +#include "assets/act_m_ka/act_m_ka_v.inc" +}; + +Gfx act_m_ka1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_ka_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 48, act_m_ka_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_ka_v, 8, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 5, 6), + gsSPNTriangles_5b(4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_ka2_1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 180), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_ka_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 48, act_m_ka_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_ka_v[8], 8, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 5, 6), + gsSPNTriangles_5b(4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_ka2_2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 180), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_ka_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 48, act_m_ka_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_ka_v[16], 8, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 5, 6), + gsSPNTriangles_5b(4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_kabuto.c b/src/data/model/act_m_kabuto.c new file mode 100644 index 00000000..b20fa62c --- /dev/null +++ b/src/data/model/act_m_kabuto.c @@ -0,0 +1,47 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_kabuto_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_kabuto/act_m_kabuto_pal.inc" +}; + +static u8 act_m_kabuto[] = { +#include "assets/act_m_kabuto/act_m_kabuto.inc" +}; + +static Vtx act_m_kabuto_v[] = { +#include "assets/act_m_kabuto/act_m_kabuto_v.inc" +}; + +Gfx act_m_kabuto1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_kabuto_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_kabuto), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_kabuto_v, 7, 0), + gsSPNTrianglesInit_5b(6, 0, 1, 2, 0, 3, 4, 0, 4, 1), + gsSPNTriangles_5b(4, 5, 6, 4, 6, 1, 6, 2, 1, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_kabuto2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_kabuto_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_kabuto), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_kabuto_v[7], 7, 0), + gsSPNTrianglesInit_5b(6, 0, 1, 2, 0, 2, 3, 2, 4, 3), + gsSPNTriangles_5b(5, 3, 4, 5, 6, 0, 5, 0, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_kamakiri.c b/src/data/model/act_m_kamakiri.c new file mode 100644 index 00000000..039f3986 --- /dev/null +++ b/src/data/model/act_m_kamakiri.c @@ -0,0 +1,48 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_kamakiri_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_kamakiri/act_m_kamakiri_pal.inc" +}; + +static u8 act_m_kamakiri[] = { +#include "assets/act_m_kamakiri/act_m_kamakiri.inc" +}; + +static Vtx act_m_kamakiri_v[] = { +#include "assets/act_m_kamakiri/act_m_kamakiri_v.inc" +}; + +Gfx act_m_kamakiri1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_kamakiri_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_kamakiri), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_kamakiri_v, 14, 0), + gsSPNTrianglesInit_5b(10, 0, 1, 2, 3, 4, 1, 3, 5, 4), + gsSPNTriangles_5b(1, 6, 7, 1, 8, 6, 9, 4, 5, 9, 1, 4), + gsSPNTriangles_5b(10, 11, 1, 12, 13, 1, 13, 8, 1, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_kamakiri2_2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, SHADE, 0, COMBINED, 0, + ENVIRONMENT, 0), + gsDPSetPrimColor(0, 255, 255, 255, 255, 160), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_kamakiri_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_kamakiri), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_kamakiri_v[14], 4, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_kanabun.c b/src/data/model/act_m_kanabun.c new file mode 100644 index 00000000..0ef426a6 --- /dev/null +++ b/src/data/model/act_m_kanabun.c @@ -0,0 +1,47 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_kanabun_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_kanabun/act_m_kanabun_pal.inc" +}; + +static u8 act_m_kanabun[] = { +#include "assets/act_m_kanabun/act_m_kanabun.inc" +}; + +static Vtx act_m_kanabun_v[] = { +#include "assets/act_m_kanabun/act_m_kanabun_v.inc" +}; + +Gfx act_m_kanabun1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_kanabun_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_kanabun), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_kanabun_v, 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 1, 4, 5), + gsSPNTriangles_5b(1, 5, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_kanabun2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_kanabun_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_kanabun), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_kanabun_v[6], 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 0, 3), + gsSPNTriangles_5b(4, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_kera.c b/src/data/model/act_m_kera.c new file mode 100644 index 00000000..0c62737d --- /dev/null +++ b/src/data/model/act_m_kera.c @@ -0,0 +1,33 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_kera_pal[] ATTRIBUTE_ALIGN(32)= { +#include "assets/act_m_kera/act_m_kera_pal.inc" +}; + +static u8 act_m_kera_tex[] ATTRIBUTE_ALIGN(32)= { +#include "assets/act_m_kera/act_m_kera_tex.inc" +}; + +static Vtx act_m_kera_v[] = { +#include "assets/act_m_kera/act_m_kera_v.inc" +}; + +Gfx act_m_keraT_model[] = { +gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), +gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), +gsDPSetPrimColor(0, 255, 255, 255, 255, 255), +gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), +gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_kera_pal), +gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 32, act_m_kera_tex), +gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), +gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), +gsSPVertex(act_m_kera_v, 6, 0), +gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 1, 4, 5), +gsSPNTriangles_5b(1, 5, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), +gsSPEndDisplayList(), +}; + diff --git a/src/data/model/act_m_kiageha.c b/src/data/model/act_m_kiageha.c new file mode 100644 index 00000000..13c62070 --- /dev/null +++ b/src/data/model/act_m_kiageha.c @@ -0,0 +1,47 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_kiageha_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_kiageha/act_m_kiageha_pal.inc" +}; + +static u8 act_m_kiageha[] = { +#include "assets/act_m_kiageha/act_m_kiageha.inc" +}; + +static Vtx act_m_kiageha_v[] = { +#include "assets/act_m_kiageha/act_m_kiageha_v.inc" +}; + +Gfx act_m_kiageha1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_kiageha_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_m_kiageha), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_kiageha_v, 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 1, 4, 5), + gsSPNTriangles_5b(1, 5, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_kiageha2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_kiageha_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_m_kiageha), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_kiageha_v[6], 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 0, 3), + gsSPNTriangles_5b(4, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_kirigirisu.c b/src/data/model/act_m_kirigirisu.c new file mode 100644 index 00000000..19a4fdd6 --- /dev/null +++ b/src/data/model/act_m_kirigirisu.c @@ -0,0 +1,48 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_kirigirisu_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_kirigirisu/act_m_kirigirisu_pal.inc" +}; + +static u8 act_m_kirigirisu[] = { +#include "assets/act_m_kirigirisu/act_m_kirigirisu.inc" +}; + +static Vtx act_m_kirigirisu_v[] = { +#include "assets/act_m_kirigirisu/act_m_kirigirisu_v.inc" +}; + +Gfx act_m_kirigirisu1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_kirigirisu_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_kirigirisu), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_kirigirisu_v, 15, 0), + gsSPNTrianglesInit_5b(10, 0, 1, 2, 0, 3, 1, 1, 4, 2), + gsSPNTriangles_5b(3, 5, 1, 5, 6, 1, 6, 4, 1, 7, 8, 9), + gsSPNTriangles_5b(7, 9, 10, 11, 12, 13, 11, 13, 14, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_kirigirisu2_2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, SHADE, 0, COMBINED, 0, + ENVIRONMENT, 0), + gsDPSetPrimColor(0, 255, 255, 255, 255, 160), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_kirigirisu_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_kirigirisu), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_kirigirisu_v[15], 4, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_koorogi.c b/src/data/model/act_m_koorogi.c new file mode 100644 index 00000000..398e8b43 --- /dev/null +++ b/src/data/model/act_m_koorogi.c @@ -0,0 +1,32 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_koorogi_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_koorogi/act_m_koorogi_pal.inc" +}; + +static u8 act_m_koorogi[] = { +#include "assets/act_m_koorogi/act_m_koorogi.inc" +}; + +static Vtx act_m_koorogi_v[] = { +#include "assets/act_m_koorogi/act_m_koorogi_v.inc" +}; + +Gfx act_m_koorogi1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_koorogi_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 48, act_m_koorogi), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_koorogi_v, 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 1, 4, 5), + gsSPNTriangles_5b(1, 5, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_kumo.c b/src/data/model/act_m_kumo.c new file mode 100644 index 00000000..d63d7270 --- /dev/null +++ b/src/data/model/act_m_kumo.c @@ -0,0 +1,61 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_kumo_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_kumo/act_m_kumo_pal.inc" +}; + +static u8 act_m_kumo_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_kumo/act_m_kumo_tex.inc" +}; + +static Vtx act_m_kumo_v[] = { +#include "assets/act_m_kumo/act_m_kumo_v.inc" +}; + +Gfx act_m_kumo1_1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_kumo_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 48, act_m_kumo_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_kumo_v, 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 1, 4, 5), + gsSPNTriangles_5b(1, 5, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_kumo1_2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_kumo_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 48, act_m_kumo_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_kumo_v[6], 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 1, 4, 5), + gsSPNTriangles_5b(1, 5, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_kumo2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 180), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_kumo_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 48, act_m_kumo_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_kumo_v[12], 4, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_maimai.c b/src/data/model/act_m_maimai.c new file mode 100644 index 00000000..2e1d7eb5 --- /dev/null +++ b/src/data/model/act_m_maimai.c @@ -0,0 +1,35 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_maimai_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_maimai/act_m_maimai_pal.inc" +}; + +static u8 act_m_maimai_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_maimai/act_m_maimai_tex.inc" +}; + +static Vtx act_m_maimai_v[] = { +#include "assets/act_m_maimai/act_m_maimai_v.inc" +}; + +Gfx act_m_maimaiT_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_maimai_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_m_maimai_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_maimai_v, 16, 0), + gsSPNTrianglesInit_5b(5, 0, 1, 2, 3, 4, 5, 3, 5, 6), + gsSPNTriangles_5b(3, 7, 1, 8, 2, 1, 0, 0, 0, 0, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPNTrianglesInit_5b(6, 9, 10, 11, 9, 12, 10, 12, 13, 10), + gsSPNTriangles_5b(13, 14, 10, 14, 15, 10, 15, 11, 10, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_matmushi.c b/src/data/model/act_m_matmushi.c new file mode 100644 index 00000000..db98b0d1 --- /dev/null +++ b/src/data/model/act_m_matmushi.c @@ -0,0 +1,32 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_matumushi_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_matmushi/act_m_matumushi_pal.inc" +}; + +static u8 act_m_matumushi[] = { +#include "assets/act_m_matmushi/act_m_matumushi.inc" +}; + +static Vtx act_m_matumushi_v[] = { +#include "assets/act_m_matmushi/act_m_matumushi_v.inc" +}; + +Gfx act_m_matumushi1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_matumushi_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 48, act_m_matumushi), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_matumushi_v, 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 1, 4, 5), + gsSPNTriangles_5b(1, 5, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_minmin.c b/src/data/model/act_m_minmin.c new file mode 100644 index 00000000..a9b11abd --- /dev/null +++ b/src/data/model/act_m_minmin.c @@ -0,0 +1,64 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_minmin_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_minmin/act_m_minmin_pal.inc" +}; + +static u8 act_m_minmin[] = { +#include "assets/act_m_minmin/act_m_minmin.inc" +}; + +static Vtx act_m_minmin_v[] = { +#include "assets/act_m_minmin/act_m_minmin_v.inc" +}; + +Gfx act_m_minmin1_1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_minmin_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_minmin), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_minmin_v, 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 1, 4, 5), + gsSPNTriangles_5b(1, 5, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_minmin1_2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, SHADE, 0, COMBINED, 0, + ENVIRONMENT, 0), + gsDPSetPrimColor(0, 255, 255, 255, 255, 160), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_minmin_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_minmin), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_minmin_v[6], 8, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 5, 6), + gsSPNTriangles_5b(4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_minmin2_2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, SHADE, 0, COMBINED, 0, + ENVIRONMENT, 0), + gsDPSetPrimColor(0, 255, 255, 255, 255, 160), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_minmin_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_minmin), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_minmin_v[14], 8, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 5, 6), + gsSPNTriangles_5b(4, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_mino.c b/src/data/model/act_m_mino.c new file mode 100644 index 00000000..fa1cedfe --- /dev/null +++ b/src/data/model/act_m_mino.c @@ -0,0 +1,61 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_mino_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_mino/act_m_mino_pal.inc" +}; + +static u8 act_m_mino_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_mino/act_m_mino_tex.inc" +}; + +static Vtx act_m_mino_v[] = { +#include "assets/act_m_mino/act_m_mino_v.inc" +}; + +Gfx act_m_mino1_1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_mino_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_m_mino_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_MIRROR, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_mino_v, 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 3, 2, 4), + gsSPNTriangles_5b(3, 4, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_mino1_2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_mino_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_m_mino_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_MIRROR, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_mino_v[6], 9, 0), + gsSPNTrianglesInit_5b(5, 0, 1, 2, 3, 4, 5, 3, 5, 6), + gsSPNTriangles_5b(6, 5, 7, 6, 7, 8, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_mino2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 180), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_mino_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_m_mino_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_MIRROR, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_mino_v[15], 4, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_miyama.c b/src/data/model/act_m_miyama.c new file mode 100644 index 00000000..b8f75173 --- /dev/null +++ b/src/data/model/act_m_miyama.c @@ -0,0 +1,48 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_miyama_pal[] ATTRIBUTE_ALIGN(32)= { +#include "assets/act_m_miyama/act_m_miyama_pal.inc" +}; + +static u8 act_m_miyama[] = { +#include "assets/act_m_miyama/act_m_miyama.inc" +}; + +static Vtx act_m_miyama_v[] = { +#include "assets/act_m_miyama/act_m_miyama_v.inc" +}; + +Gfx act_m_miyama1T_model[] = { +gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), +gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), +gsDPSetPrimColor(0, 255, 255, 255, 255, 255), +gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), +gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_miyama_pal), +gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_miyama), +gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), +gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), +gsSPVertex(act_m_miyama_v, 6, 0), +gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 1, 4, 5), +gsSPNTriangles_5b(1, 5, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), +gsSPEndDisplayList(), +}; + +Gfx act_m_miyama2T_model[] = { +gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), +gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), +gsDPSetPrimColor(0, 255, 255, 255, 255, 255), +gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), +gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_miyama_pal), +gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_miyama), +gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), +gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), +gsSPVertex(&act_m_miyama_v[6], 6, 0), +gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 0, 3), +gsSPNTriangles_5b(4, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), +gsSPEndDisplayList(), +}; + diff --git a/src/data/model/act_m_monki.c b/src/data/model/act_m_monki.c new file mode 100644 index 00000000..2dd4a16b --- /dev/null +++ b/src/data/model/act_m_monki.c @@ -0,0 +1,47 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_monki_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_monki/act_m_monki_pal.inc" +}; + +static u8 act_m_monki[] = { +#include "assets/act_m_monki/act_m_monki.inc" +}; + +static Vtx act_m_monki_v[] = { +#include "assets/act_m_monki/act_m_monki_v.inc" +}; + +Gfx act_m_monki1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_monki_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 16, act_m_monki), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_monki_v, 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 1, 4, 5), + gsSPNTriangles_5b(1, 5, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_monki2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_monki_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 16, act_m_monki), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_monki_v[6], 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 0, 3), + gsSPNTriangles_5b(4, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_monshiro.c b/src/data/model/act_m_monshiro.c new file mode 100644 index 00000000..28204c04 --- /dev/null +++ b/src/data/model/act_m_monshiro.c @@ -0,0 +1,47 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_monshiro_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_monshiro/act_m_monshiro_pal.inc" +}; + +static u8 act_m_monshiro[] = { +#include "assets/act_m_monshiro/act_m_monshiro.inc" +}; + +static Vtx act_m_monshiro_v[] = { +#include "assets/act_m_monshiro/act_m_monshiro_v.inc" +}; + +Gfx act_m_monshiro1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_monshiro_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 16, act_m_monshiro), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_monshiro_v, 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 1, 4, 5), + gsSPNTriangles_5b(1, 5, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_monshiro2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_monshiro_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 16, act_m_monshiro), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_monshiro_v[6], 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 0, 3), + gsSPNTriangles_5b(4, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_nanahoshi.c b/src/data/model/act_m_nanahoshi.c new file mode 100644 index 00000000..37e69581 --- /dev/null +++ b/src/data/model/act_m_nanahoshi.c @@ -0,0 +1,51 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_nanahoshi_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_nanahoshi/act_m_nanahoshi_pal.inc" +}; + +static u8 act_m_nanahoshi[] = { +#include "assets/act_m_nanahoshi/act_m_nanahoshi.inc" +}; + +static Vtx act_m_nanahoshi_v[] = { +#include "assets/act_m_nanahoshi/act_m_nanahoshi_v.inc" +}; + +Gfx act_m_nanahoshi1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_nanahoshi_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 32, act_m_nanahoshi), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_nanahoshi_v, 14, 0), + gsSPNTrianglesInit_5b(15, 0, 1, 2, 3, 4, 5, 6, 3, 5), + gsSPNTriangles_5b(2, 1, 7, 6, 5, 8, 9, 6, 8, 7, 1, 10), + gsSPNTriangles_5b(9, 8, 7, 11, 9, 7, 4, 3, 12, 4, 12, 13), + gsSPNTriangles_5b(1, 0, 4, 10, 1, 4, 11, 7, 13, 11, 13, 12), + gsSPEndDisplayList(), +}; + +Gfx act_m_nanahoshi2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_nanahoshi_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 32, act_m_nanahoshi), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_nanahoshi_v[14], 15, 0), + gsSPNTrianglesInit_5b(15, 0, 1, 2, 0, 3, 1, 4, 5, 6), + gsSPNTriangles_5b(5, 7, 6, 8, 2, 1, 8, 9, 2, 0, 10, 3), + gsSPNTriangles_5b(10, 11, 3, 12, 5, 4, 10, 13, 11, 13, 7, 11), + gsSPNTriangles_5b(14, 5, 12, 13, 9, 7, 9, 8, 7, 7, 5, 14), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_nokogiri.c b/src/data/model/act_m_nokogiri.c new file mode 100644 index 00000000..9f7ba07f --- /dev/null +++ b/src/data/model/act_m_nokogiri.c @@ -0,0 +1,47 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_nokogiri_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_nokogiri/act_m_nokogiri_pal.inc" +}; + +static u8 act_m_nokogiri[] = { +#include "assets/act_m_nokogiri/act_m_nokogiri.inc" +}; + +static Vtx act_m_nokogiri_v[] = { +#include "assets/act_m_nokogiri/act_m_nokogiri_v.inc" +}; + +Gfx act_m_nokogiri1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_nokogiri_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_nokogiri), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_nokogiri_v, 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 1, 4, 5), + gsSPNTriangles_5b(1, 5, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_nokogiri2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_nokogiri_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 64, act_m_nokogiri), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_nokogiri_v[6], 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 0, 3), + gsSPNTriangles_5b(4, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/act_m_ohmurasaki.c b/src/data/model/act_m_ohmurasaki.c new file mode 100644 index 00000000..a9ce3164 --- /dev/null +++ b/src/data/model/act_m_ohmurasaki.c @@ -0,0 +1,47 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +static u16 act_m_ohmurasaki_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/act_m_ohmurasaki/act_m_ohmurasaki_pal.inc" +}; + +static u8 act_m_ohmurasaki[] = { +#include "assets/act_m_ohmurasaki/act_m_ohmurasaki.inc" +}; + +static Vtx act_m_ohmurasaki_v[] = { +#include "assets/act_m_ohmurasaki/act_m_ohmurasaki_v.inc" +}; + +Gfx act_m_ohmurasaki1T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_ohmurasaki_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_m_ohmurasaki), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(act_m_ohmurasaki_v, 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 1, 4, 5), + gsSPNTriangles_5b(1, 5, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx act_m_ohmurasaki2T_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 255, 255, 255, 255, 255), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_ZB_XLU_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, act_m_ohmurasaki_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 32, 32, act_m_ohmurasaki), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&act_m_ohmurasaki_v[6], 6, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 2, 3, 4, 0, 3), + gsSPNTriangles_5b(4, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/model/boy_model.c b/src/data/model/boy_model.c index 22382f4c..e31b2957 100644 --- a/src/data/model/boy_model.c +++ b/src/data/model/boy_model.c @@ -422,6 +422,4 @@ cKF_Joint_R_c cKF_je_r_boy_1_tbl[] = { { NULL, 0, cKF_JOINT_FLAG_DISP_OPA, { 1275, 0, 0 } }, }; -cKF_Skeleton_R_c cKF_bs_r_boy_1[] = { - { ARRAY_COUNT(cKF_je_r_boy_1_tbl), 13, cKF_je_r_boy_1_tbl }, -}; +cKF_Skeleton_R_c cKF_bs_r_boy_1 = { ARRAY_COUNT(cKF_je_r_boy_1_tbl), 13, cKF_je_r_boy_1_tbl }; diff --git a/src/data/model/furniture_pull.c b/src/data/model/furniture_pull.c new file mode 100644 index 00000000..be77ccf9 --- /dev/null +++ b/src/data/model/furniture_pull.c @@ -0,0 +1,24 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u8 cKF_ckcb_r_furniture_pull_tbl[] = { 8 }; + +s16 cKF_kn_furniture_pull_tbl[] = { 22 }; + +s16 cKF_c_furniture_pull_tbl[] = { 0, 0, 0, 0, 0 }; + +s16 cKF_ds_furniture_pull_tbl[] = { 1, 0, -608, 2, -20, -1181, 4, -172, -3264, 5, -296, + -3277, 6, -448, -3277, 7, -625, -3277, 8, -822, -3277, 9, + -1037, -3277, 10, -1266, -3277, 11, -1505, -3277, 12, -1751, -3277, + 14, -2249, -3277, 15, -2495, -3277, 16, -2734, -3277, 17, -2963, + -3277, 18, -3178, -3277, 19, -3375, -3277, 20, -3552, -3277, 21, + -3704, -3277, 22, -3828, -3264, 24, -3980, -1181, 25, -4000, -608 }; + +cKF_Animation_R_c cKF_ba_r_furniture_pull = { cKF_ckcb_r_furniture_pull_tbl, + cKF_ds_furniture_pull_tbl, + cKF_kn_furniture_pull_tbl, + cKF_c_furniture_pull_tbl, + -1, + 25 }; diff --git a/src/data/model/furniture_push.c b/src/data/model/furniture_push.c new file mode 100644 index 00000000..05ffae5b --- /dev/null +++ b/src/data/model/furniture_push.c @@ -0,0 +1,23 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u8 cKF_ckcb_r_furniture_push_tbl[] = { 8 }; + +s16 cKF_kn_furniture_push_tbl[] = { 22 }; + +s16 cKF_c_furniture_push_tbl[] = { 0, 0, 0, 0, 0 }; + +s16 cKF_ds_furniture_push_tbl[] = { 1, 0, 92, 3, 19, 803, 5, 126, 2715, 6, 238, 3277, 7, 400, + 3277, 8, 602, 3277, 9, 822, 3277, 10, 1057, 3277, 11, 1304, 3277, 12, + 1559, 3277, 14, 2082, 3277, 15, 2342, 3277, 16, 2598, 3277, 17, 2845, 3277, + 18, 3080, 3277, 19, 3300, 3277, 20, 3499, 3277, 21, 3669, 3277, 22, 3808, + 3277, 23, 3912, 2535, 24, 3977, 1314, 25, 4000, 675 }; + +cKF_Animation_R_c cKF_ba_r_furniture_push = { cKF_ckcb_r_furniture_push_tbl, + cKF_ds_furniture_push_tbl, + cKF_kn_furniture_push_tbl, + cKF_c_furniture_push_tbl, + -1, + 25 }; diff --git a/src/data/model/furniture_stop.c b/src/data/model/furniture_stop.c new file mode 100644 index 00000000..9f03460f --- /dev/null +++ b/src/data/model/furniture_stop.c @@ -0,0 +1,18 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u8 cKF_ckcb_r_furniture_stop_tbl[] = { 0 }; + +s16 cKF_c_furniture_stop_tbl[] = { 0, 0, 0, 0, 0, 0 }; + +cKF_Animation_R_c cKF_ba_r_furniture_stop = { + cKF_ckcb_r_furniture_stop_tbl, NULL, NULL, cKF_c_furniture_stop_tbl, -1, 2 +}; + +cKF_Joint_R_c cKF_je_r_furniture_stop_tbl[] = { + { NULL, 0, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } }, +}; + +cKF_Skeleton_R_c cKF_bs_r_furniture_stop = { ARRAY_COUNT(cKF_je_r_furniture_stop_tbl), 0, cKF_je_r_furniture_stop_tbl }; diff --git a/src/data/model/girl_model.c b/src/data/model/girl_model.c index 8b16060b..7611a50b 100644 --- a/src/data/model/girl_model.c +++ b/src/data/model/girl_model.c @@ -389,6 +389,4 @@ cKF_Joint_R_c cKF_je_r_grl_1_tbl[] = { { NULL, 0, cKF_JOINT_FLAG_DISP_OPA, { 1375, 0, 0 } }, }; -cKF_Skeleton_R_c cKF_bs_r_grl_1[] = { - { ARRAY_COUNT(cKF_je_r_grl_1_tbl), 13, cKF_je_r_grl_1_tbl }, -}; +cKF_Skeleton_R_c cKF_bs_r_grl_1 = { ARRAY_COUNT(cKF_je_r_grl_1_tbl), 13, cKF_je_r_grl_1_tbl }; diff --git a/src/data/model/hnw_face.c b/src/data/model/hnw_face.c new file mode 100644 index 00000000..6d501610 --- /dev/null +++ b/src/data/model/hnw_face.c @@ -0,0 +1,13 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +u16 hnw_face[] = { +#include "assets/hnw_face.inc" +}; + +u8 hnw_tmem_txt[] = { +#include "assets/hnw_tmem_txt.inc" +}; diff --git a/src/data/model/hnw_model.c b/src/data/model/hnw_model.c new file mode 100644 index 00000000..204cb7f3 --- /dev/null +++ b/src/data/model/hnw_model.c @@ -0,0 +1,197 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +Vtx hnw_v[] = { +#include "assets/hnw_v.inc" +}; + +Gfx head_hnw_model[] = { + gsSPMatrix(anime_6_mdl, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW), + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsSPVertex(hnw_v, 12, 0), + gsSPMatrix(&anime_6_mdl[1], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW), + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 32, anime_4_txt + 0x80), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPVertex(&hnw_v[12], 18, 12), + gsSPNTrianglesInit_5b(2, 3, 1, 12, 3, 13, 14, 0, 0, 0), + gsSPNTrianglesInit_5b(2, 2, 15, 16, 4, 2, 17, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 32, anime_4_txt + 0x180), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPNTrianglesInit_5b(2, 7, 18, 19, 0, 7, 20, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 32, anime_4_txt + 0x280), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPNTrianglesInit_5b(2, 6, 21, 22, 6, 10, 23, 0, 0, 0), + gsSPNTrianglesInit_5b(2, 8, 24, 25, 11, 8, 26, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 32, anime_4_txt + 0x180), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPNTrianglesInit_5b(2, 9, 27, 28, 9, 5, 29, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 16, anime_4_txt), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPVertex(&hnw_v[30], 31, 0), + gsSPNTrianglesInit_5b(12, 0, 1, 2, 3, 1, 4, 5, 1, 3), + gsSPNTriangles_5b(1, 5, 2, 3, 6, 7, 2, 5, 7, 2, 8, 9), + gsSPNTriangles_5b(10, 6, 3, 7, 8, 2, 7, 5, 3, 2, 9, 0), + gsSPNTriangles_5b(0, 10, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 32, anime_4_txt + 0x80), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPNTrianglesInit_5b(2, 11, 12, 13, 13, 14, 11, 0, 0, 0), + gsSPNTrianglesInit_5b(2, 15, 16, 17, 17, 18, 15, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 32, anime_4_txt + 0x180), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPNTrianglesInit_5b(2, 19, 20, 21, 21, 22, 19, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 32, anime_4_txt + 0x280), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPNTrianglesInit_5b(2, 23, 24, 25, 25, 26, 23, 0, 0, 0), + gsSPNTrianglesInit_5b(2, 27, 28, 29, 29, 30, 27, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 32, anime_4_txt + 0x180), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPVertex(&hnw_v[61], 31, 0), + gsSPNTrianglesInit_5b(2, 0, 1, 2, 2, 3, 0, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 32, anime_4_txt + 0x280), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPNTrianglesInit_5b(12, 4, 5, 6, 7, 8, 6, 7, 9, 10), + gsSPNTriangles_5b(11, 12, 13, 11, 14, 15, 4, 16, 17, 10, 9, 18), + gsSPNTriangles_5b(17, 12, 11, 17, 19, 4, 6, 20, 7, 10, 21, 22), + gsSPNTriangles_5b(6, 23, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 16, anime_4_txt + 0x380), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPNTrianglesInit_5b(5, 24, 25, 26, 27, 26, 25, 25, 28, 27), + gsSPNTriangles_5b(27, 28, 29, 26, 30, 24, 0, 0, 0, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 16, anime_4_txt + 0x400), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPVertex(&hnw_v[92], 28, 0), + gsSPNTrianglesInit_5b(5, 0, 1, 2, 2, 3, 0, 2, 1, 4), + gsSPNTriangles_5b(4, 5, 2, 6, 0, 3, 0, 0, 0, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 16, anime_4_txt + 0x380), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPNTrianglesInit_5b(4, 7, 8, 9, 10, 11, 9, 9, 12, 10), + gsSPNTriangles_5b(9, 11, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPNTrianglesInit_5b(4, 13, 14, 15, 15, 16, 13, 15, 14, 17), + gsSPNTriangles_5b(17, 18, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 16, anime_4_txt + 0x400), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPNTrianglesInit_5b(4, 19, 20, 21, 22, 23, 24, 22, 25, 26), + gsSPNTriangles_5b(26, 27, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 16, anime_4_txt + 0x480), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPVertex(&hnw_v[120], 28, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 0, 3, 4, 4, 5, 0), + gsSPNTriangles_5b(2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPNTrianglesInit_5b(4, 6, 7, 8, 9, 10, 8, 8, 10, 6), + gsSPNTriangles_5b(8, 11, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 16, anime_4_txt + 0x400), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPNTrianglesInit_5b(4, 12, 13, 14, 14, 15, 12, 16, 17, 18), + gsSPNTriangles_5b(14, 19, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 16, anime_4_txt + 0x380), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPNTrianglesInit_5b(5, 21, 22, 23, 24, 23, 25, 26, 22, 21), + gsSPNTriangles_5b(23, 24, 21, 25, 27, 24, 0, 0, 0, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 16, anime_4_txt + 0x400), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPVertex(&hnw_v[148], 22, 0), + gsSPNTrianglesInit_5b(5, 0, 1, 2, 3, 4, 5, 6, 2, 7), + gsSPNTriangles_5b(2, 6, 0, 0, 8, 9, 0, 0, 0, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 16, anime_4_txt + 0x480), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPNTrianglesInit_5b(4, 10, 11, 12, 12, 13, 10, 14, 11, 15), + gsSPNTriangles_5b(14, 12, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPNTrianglesInit_5b(4, 16, 17, 18, 19, 17, 20, 17, 16, 20), + gsSPNTriangles_5b(18, 21, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx handR_hnw_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 16, anime_4_txt + 0x500), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPVertex(&hnw_v[170], 18, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 2, 1, 3, 2, 4, 0), + gsSPNTriangles_5b(3, 4, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 16, anime_4_txt + 0x580), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPNTrianglesInit_5b(18, 5, 6, 7, 5, 8, 9, 9, 10, 11), + gsSPNTriangles_5b(7, 6, 11, 9, 12, 10, 12, 9, 8, 13, 14, 12), + gsSPNTriangles_5b(11, 15, 9, 12, 14, 16, 7, 17, 13, 9, 15, 5), + gsSPNTriangles_5b(16, 10, 12, 11, 10, 7, 7, 8, 5, 7, 10, 16), + gsSPNTriangles_5b(12, 8, 13, 13, 8, 7, 16, 17, 7, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx handL_hnw_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 16, anime_4_txt + 0x500), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPVertex(&hnw_v[188], 18, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 3, 1, 0, 2, 4, 0), + gsSPNTriangles_5b(0, 4, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 16, anime_4_txt + 0x580), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPNTrianglesInit_5b(18, 5, 6, 7, 8, 9, 7, 10, 11, 8), + gsSPNTriangles_5b(10, 6, 5, 11, 12, 8, 9, 8, 12, 12, 13, 14), + gsSPNTriangles_5b(8, 15, 10, 16, 13, 12, 14, 17, 5, 7, 15, 8), + gsSPNTriangles_5b(12, 11, 16, 5, 11, 10, 7, 9, 5, 16, 11, 5), + gsSPNTriangles_5b(14, 9, 12, 5, 9, 14, 5, 17, 16, 0, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx body_hnw_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 16, anime_4_txt + 0x600), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPVertex(&hnw_v[206], 23, 0), + gsSPNTrianglesInit_5b(6, 0, 1, 2, 0, 3, 4, 5, 3, 0), + gsSPNTriangles_5b(0, 2, 5, 6, 1, 0, 0, 4, 6, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 16, anime_4_txt + 0x680), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPNTrianglesInit_5b(4, 7, 8, 9, 10, 11, 12, 12, 13, 10), + gsSPNTriangles_5b(9, 14, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPNTrianglesInit_5b(4, 15, 16, 17, 18, 19, 20, 20, 21, 18), + gsSPNTriangles_5b(17, 22, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 16, anime_4_txt + 0x700), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPVertex(&hnw_v[229], 24, 0), + gsSPNTrianglesInit_5b(8, 0, 1, 2, 3, 4, 5, 6, 7, 8), + gsSPNTriangles_5b(2, 9, 0, 10, 11, 12, 5, 13, 3, 8, 14, 6), + gsSPNTriangles_5b(12, 15, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 16, anime_4_txt + 0x780), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPNTrianglesInit_5b(4, 16, 17, 18, 19, 20, 21, 18, 22, 16), + gsSPNTriangles_5b(21, 23, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPVertex(&hnw_v[253], 23, 0), + gsSPNTrianglesInit_5b(4, 0, 1, 2, 3, 4, 5, 5, 6, 3), + gsSPNTriangles_5b(2, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 16, 32, anime_4_txt + 0x280), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_CLAMP, GX_CLAMP, 0, 0), + gsSPNTrianglesInit_5b(12, 8, 9, 10, 11, 12, 10, 10, 13, 14), + gsSPNTriangles_5b(15, 16, 17, 11, 18, 19, 8, 16, 15, 19, 20, 17), + gsSPNTriangles_5b(19, 21, 11, 17, 20, 15, 15, 9, 8, 17, 22, 19), + gsSPNTriangles_5b(10, 12, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; + +cKF_Joint_R_c cKF_je_r_hnw_tbl[] = { { NULL, 1, cKF_JOINT_FLAG_DISP_OPA, { 0, 419, 0 } }, + { body_hnw_model, 1, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } }, + { head_hnw_model, 2, cKF_JOINT_FLAG_DISP_OPA, { 629, 0, 0 } }, + { NULL, 1, cKF_JOINT_FLAG_DISP_OPA, { 563, 65065, 0 } }, + { handL_hnw_model, 0, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } }, + { NULL, 1, cKF_JOINT_FLAG_DISP_OPA, { 562, 460, 0 } }, + { handR_hnw_model, 0, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } } }; + +cKF_Skeleton_R_c cKF_bs_r_hnw = { ARRAY_COUNT(cKF_je_r_hnw_tbl), 4, cKF_je_r_hnw_tbl }; diff --git a/src/data/model/hnw_move.c b/src/data/model/hnw_move.c new file mode 100644 index 00000000..87b59ab5 --- /dev/null +++ b/src/data/model/hnw_move.c @@ -0,0 +1,23 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +u8 cKF_ckcb_r_hnw_move_tbl[] = { 0, 0, 3, 0, 4, 0, 4 }; + +s16 cKF_kn_hnw_move_tbl[] = { 8, 8, 8, 8 }; + +s16 cKF_c_hnw_move_tbl[] = { 0, 419, 0, 0, 0, 0, 0, 0, 900, 0, 0, 0, -899, 0, 4, 0, 1800, -899, 0, 4 }; + +s16 cKF_ds_hnw_move_tbl[] = { 1, 94, 1687, 2, 150, 0, 3, 94, -2250, 5, -94, -2250, 6, -150, 0, + 7, -94, 2250, 8, 0, 2813, 9, 94, 2813, 1, -125, 3750, 2, 0, 3750, + 3, 125, 3000, 4, 200, 0, 5, 125, -3000, 7, -125, -3000, 8, -200, 0, + 9, -125, 2250, 1, 281, -8437, 2, 0, 0, 3, 281, 13500, 5, 1519, 13500, + 6, 1800, 0, 7, 1519, -13500, 8, 900, -18563, 9, 281, -18563, 1, -1519, -8438, + 2, -1800, 0, 3, -1519, 13500, 5, -281, 13500, 6, 0, 0, 7, -281, -13500, + 8, -900, -18563, 9, -1519, -18563 }; + +cKF_Animation_R_c cKF_ba_r_hnw_move = { + cKF_ckcb_r_hnw_move_tbl, cKF_ds_hnw_move_tbl, cKF_kn_hnw_move_tbl, cKF_c_hnw_move_tbl, -1, 9 +}; diff --git a/src/data/model/obj_cstump5.c b/src/data/model/obj_cstump5.c index 3ee0c414..db1d2e06 100644 --- a/src/data/model/obj_cstump5.c +++ b/src/data/model/obj_cstump5.c @@ -3,24 +3,22 @@ #include "evw_anime.h" #include "c_keyframe.h" - -u8 obj_cstump_shadow_tex[] ATTRIBUTE_ALIGN(32)= { +u8 obj_cstump_shadow_tex[] ATTRIBUTE_ALIGN(32) = { #include "assets/obj_cstump_shadow_tex.inc" }; -Vtx obj_cstump5_shadow_v[] = { +Vtx obj_cstump5_shadow_v[] = { #include "assets/obj_cstump5_shadow_v.inc" }; -Gfx obj_cstump5_shadowT_mat_model[] = { -gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), -gsDPSetTextureImage_Dolphin(G_IM_FMT_I, G_IM_SIZ_4b, 32, 32, obj_cstump_shadow_tex), -gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), -gsSPEndDisplayList() +Gfx obj_cstump5_shadowT_mat_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureImage_Dolphin(G_IM_FMT_I, G_IM_SIZ_4b, 32, 32, obj_cstump_shadow_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_CLAMP, 0, 0), + gsSPEndDisplayList(), }; -Gfx obj_cstump5_shadowT_gfx_model[] = { -gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), -gsSPEndDisplayList() +Gfx obj_cstump5_shadowT_gfx_model[] = { + gsSPNTrianglesInit_5b(2, 0, 1, 2, 0, 2, 3, 0, 0, 0), + gsSPEndDisplayList(), }; - diff --git a/src/data/model/obj_garagara.c b/src/data/model/obj_garagara.c index 6f178138..59fe4b5e 100644 --- a/src/data/model/obj_garagara.c +++ b/src/data/model/obj_garagara.c @@ -107,8 +107,9 @@ s16 cKF_c_obj_gara_tbl[] = { 0, 0, 0, 0, 0, 900, 0, 0, 0, 0, 0 }; s16 cKF_ds_obj_gara_tbl[] = { 1, 0, -2019, 2, -67, -2141, 17, -1674, -3504, 21, -2136, -3460, 26, -2700, -3221, 31, -3157, -2242, 40, -3581, -637, 43, -3616, -58, 47, -3602, 97, 48, -3600, 58 }; -cKF_Animation_R_c cKF_ba_r_obj_gara[] = { { cKF_ckcb_r_obj_gara_tbl, cKF_ds_obj_gara_tbl, cKF_kn_obj_gara_tbl, - cKF_c_obj_gara_tbl, -1, 48 } }; +cKF_Animation_R_c cKF_ba_r_obj_gara = { + cKF_ckcb_r_obj_gara_tbl, cKF_ds_obj_gara_tbl, cKF_kn_obj_gara_tbl, cKF_c_obj_gara_tbl, -1, 48 +}; u16 act_fukuball_pal[] = { #include "assets/act_fukuball_pal.inc" @@ -170,6 +171,4 @@ cKF_Joint_R_c cKF_je_r_obj_gara_tbl[] = { { obj_gara_hex_model, 0, cKF_JOINT_FLAG_DISP_OPA, { 1400, 0, 0 } }, }; -cKF_Skeleton_R_c cKF_bs_r_obj_gara[] = { - { ARRAY_COUNT(cKF_je_r_obj_gara_tbl), 2, cKF_je_r_obj_gara_tbl }, -}; +cKF_Skeleton_R_c cKF_bs_r_obj_gara = { ARRAY_COUNT(cKF_je_r_obj_gara_tbl), 2, cKF_je_r_obj_gara_tbl }; diff --git a/src/data/model/player_anim.c b/src/data/model/player_anim.c index a336224b..2a754140 100644 --- a/src/data/model/player_anim.c +++ b/src/data/model/player_anim.c @@ -36,8 +36,9 @@ s16 cKF_ds_ply_1_wait1_tbl[] = { 33, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_wait1[] = { { cKF_ckcb_r_ply_1_wait1_tbl, cKF_ds_ply_1_wait1_tbl, - cKF_kn_ply_1_wait1_tbl, cKF_c_ply_1_wait1_tbl, -1, 33 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_wait1 = { + cKF_ckcb_r_ply_1_wait1_tbl, cKF_ds_ply_1_wait1_tbl, cKF_kn_ply_1_wait1_tbl, cKF_c_ply_1_wait1_tbl, -1, 33 +}; u8 cKF_ckcb_r_ply_1_walk1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -73,8 +74,9 @@ s16 cKF_ds_ply_1_walk1_tbl[] = { 1, 0, 0, 17, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_walk1[] = { { cKF_ckcb_r_ply_1_walk1_tbl, cKF_ds_ply_1_walk1_tbl, - cKF_kn_ply_1_walk1_tbl, cKF_c_ply_1_walk1_tbl, -1, 17 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_walk1 = { + cKF_ckcb_r_ply_1_walk1_tbl, cKF_ds_ply_1_walk1_tbl, cKF_kn_ply_1_walk1_tbl, cKF_c_ply_1_walk1_tbl, -1, 17 +}; u8 cKF_ckcb_r_ply_1_axe1_tbl[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -85,7 +87,7 @@ s16 cKF_c_ply_1_axe1_tbl[] = { 0, 1000, 0, 0, 0, 900, 0, 0, 0, 900, -300, -400, 710, 0, -800, 0, 920, 300, -135, 0, 0, 0, 0, -900, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_axe1[] = { { cKF_ckcb_r_ply_1_axe1_tbl, NULL, NULL, cKF_c_ply_1_axe1_tbl, -1, 2 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_axe1 = { cKF_ckcb_r_ply_1_axe1_tbl, NULL, NULL, cKF_c_ply_1_axe1_tbl, -1, 2 }; u8 cKF_ckcb_r_ply_1_run1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -129,8 +131,9 @@ s16 cKF_ds_ply_1_run1_tbl[] = { 17, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_run1[] = { { cKF_ckcb_r_ply_1_run1_tbl, cKF_ds_ply_1_run1_tbl, cKF_kn_ply_1_run1_tbl, - cKF_c_ply_1_run1_tbl, -1, 17 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_run1 = { + cKF_ckcb_r_ply_1_run1_tbl, cKF_ds_ply_1_run1_tbl, cKF_kn_ply_1_run1_tbl, cKF_c_ply_1_run1_tbl, -1, 17 +}; u8 cKF_ckcb_r_ply_1_push1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -167,8 +170,9 @@ s16 cKF_ds_ply_1_push1_tbl[] = { 25, 0, 0, 1, 0, 0, 25, 0, 0, 1, 0, 0, 25, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_push1[] = { { cKF_ckcb_r_ply_1_push1_tbl, cKF_ds_ply_1_push1_tbl, - cKF_kn_ply_1_push1_tbl, cKF_c_ply_1_push1_tbl, -1, 25 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_push1 = { + cKF_ckcb_r_ply_1_push1_tbl, cKF_ds_ply_1_push1_tbl, cKF_kn_ply_1_push1_tbl, cKF_c_ply_1_push1_tbl, -1, 25 +}; u8 cKF_ckcb_r_ply_1_pull1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -212,8 +216,9 @@ s16 cKF_ds_ply_1_pull1_tbl[] = { 25, 0, 0, 1, 0, 0, 25, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_pull1[] = { { cKF_ckcb_r_ply_1_pull1_tbl, cKF_ds_ply_1_pull1_tbl, - cKF_kn_ply_1_pull1_tbl, cKF_c_ply_1_pull1_tbl, -1, 25 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_pull1 = { + cKF_ckcb_r_ply_1_pull1_tbl, cKF_ds_ply_1_pull1_tbl, cKF_kn_ply_1_pull1_tbl, cKF_c_ply_1_pull1_tbl, -1, 25 +}; u8 cKF_ckcb_r_ply_1_hold_wait1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -248,8 +253,12 @@ s16 cKF_ds_ply_1_hold_wait1_tbl[] = { 1, 0, 0, 17, 0, 0, 1, 0, 0, 17, 0, 0, 1, 0, 0, 17, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_hold_wait1[] = { { cKF_ckcb_r_ply_1_hold_wait1_tbl, cKF_ds_ply_1_hold_wait1_tbl, - cKF_kn_ply_1_hold_wait1_tbl, cKF_c_ply_1_hold_wait1_tbl, -1, 17 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_hold_wait1 = { cKF_ckcb_r_ply_1_hold_wait1_tbl, + cKF_ds_ply_1_hold_wait1_tbl, + cKF_kn_ply_1_hold_wait1_tbl, + cKF_c_ply_1_hold_wait1_tbl, + -1, + 17 }; u8 cKF_ckcb_r_ply_1_pickup1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -294,8 +303,9 @@ s16 cKF_ds_ply_1_pickup1_tbl[] = { 29, 100, 0, 1, 0, 0, 29, 0, 0, 1, 0, 0, 29, 0, 0, 1, 0, 0, 29, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_pickup1[] = { { cKF_ckcb_r_ply_1_pickup1_tbl, cKF_ds_ply_1_pickup1_tbl, - cKF_kn_ply_1_pickup1_tbl, cKF_c_ply_1_pickup1_tbl, -1, 29 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_pickup1 = { + cKF_ckcb_r_ply_1_pickup1_tbl, cKF_ds_ply_1_pickup1_tbl, cKF_kn_ply_1_pickup1_tbl, cKF_c_ply_1_pickup1_tbl, -1, 29 +}; u8 cKF_ckcb_r_ply_1_Lturn1_tbl[] = { 48, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 2, 7, 7, 0, 7, 0, 0 }; @@ -325,8 +335,9 @@ s16 cKF_ds_ply_1_Lturn1_tbl[] = { 1, 0, 0, 13, 0, 0, 1, 0, 0, 13, 0, 0, 1, 0, 0, 13, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_Lturn1[] = { { cKF_ckcb_r_ply_1_Lturn1_tbl, cKF_ds_ply_1_Lturn1_tbl, - cKF_kn_ply_1_Lturn1_tbl, cKF_c_ply_1_Lturn1_tbl, -1, 13 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_Lturn1 = { + cKF_ckcb_r_ply_1_Lturn1_tbl, cKF_ds_ply_1_Lturn1_tbl, cKF_kn_ply_1_Lturn1_tbl, cKF_c_ply_1_Lturn1_tbl, -1, 13 +}; u8 cKF_ckcb_r_ply_1_Rturn1_tbl[] = { 48, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 2, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -355,8 +366,9 @@ s16 cKF_ds_ply_1_Rturn1_tbl[] = { 1, 0, 0, 13, 0, 0, 1, 0, 0, 13, 0, 0, 1, 0, 0, 13, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_Rturn1[] = { { cKF_ckcb_r_ply_1_Rturn1_tbl, cKF_ds_ply_1_Rturn1_tbl, - cKF_kn_ply_1_Rturn1_tbl, cKF_c_ply_1_Rturn1_tbl, -1, 13 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_Rturn1 = { + cKF_ckcb_r_ply_1_Rturn1_tbl, cKF_ds_ply_1_Rturn1_tbl, cKF_kn_ply_1_Rturn1_tbl, cKF_c_ply_1_Rturn1_tbl, -1, 13 +}; u8 cKF_ckcb_r_ply_1_get1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -383,8 +395,9 @@ s16 cKF_ds_ply_1_get1_tbl[] = { 1, 0, 0, 11, 0, 0, 1, 0, 0, 11, 0, 0, 1, 0, 0, 11, 0, 0, 1, 0, 0, 11, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_get1[] = { { cKF_ckcb_r_ply_1_get1_tbl, cKF_ds_ply_1_get1_tbl, cKF_kn_ply_1_get1_tbl, - cKF_c_ply_1_get1_tbl, -1, 11 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_get1 = { + cKF_ckcb_r_ply_1_get1_tbl, cKF_ds_ply_1_get1_tbl, cKF_kn_ply_1_get1_tbl, cKF_c_ply_1_get1_tbl, -1, 11 +}; u8 cKF_ckcb_r_ply_1_get_change1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -449,9 +462,12 @@ s16 cKF_ds_ply_1_get_change1_tbl[] = { 1, 0, 0, 93, 0, 0, 1, 0, 0, 93, 0, 0, 1, 0, 0, 93, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_get_change1[] = { { cKF_ckcb_r_ply_1_get_change1_tbl, cKF_ds_ply_1_get_change1_tbl, - cKF_kn_ply_1_get_change1_tbl, cKF_c_ply_1_get_change1_tbl, -1, - 93 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_get_change1 = { cKF_ckcb_r_ply_1_get_change1_tbl, + cKF_ds_ply_1_get_change1_tbl, + cKF_kn_ply_1_get_change1_tbl, + cKF_c_ply_1_get_change1_tbl, + -1, + 93 }; u8 ply_1_get_change11_tex_index[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -505,9 +521,12 @@ s16 cKF_ds_ply_1_get_putaway1_tbl[] = { 31, 0, 0, 1, 0, 0, 31, 0, 0, 1, 0, 0, 31, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_get_putaway1[] = { { cKF_ckcb_r_ply_1_get_putaway1_tbl, cKF_ds_ply_1_get_putaway1_tbl, - cKF_kn_ply_1_get_putaway1_tbl, cKF_c_ply_1_get_putaway1_tbl, -1, - 31 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_get_putaway1 = { cKF_ckcb_r_ply_1_get_putaway1_tbl, + cKF_ds_ply_1_get_putaway1_tbl, + cKF_kn_ply_1_get_putaway1_tbl, + cKF_c_ply_1_get_putaway1_tbl, + -1, + 31 }; u8 cKF_ckcb_r_ply_1_open1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -584,8 +603,9 @@ s16 cKF_ds_ply_1_open1_tbl[] = { 65, 0, 0, 1, 0, 0, 65, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_open1[] = { { cKF_ckcb_r_ply_1_open1_tbl, cKF_ds_ply_1_open1_tbl, - cKF_kn_ply_1_open1_tbl, cKF_c_ply_1_open1_tbl, -1, 65 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_open1 = { + cKF_ckcb_r_ply_1_open1_tbl, cKF_ds_ply_1_open1_tbl, cKF_kn_ply_1_open1_tbl, cKF_c_ply_1_open1_tbl, -1, 65 +}; u8 cKF_ckcb_r_ply_1_putaway1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -613,8 +633,9 @@ s16 cKF_ds_ply_1_putaway1_tbl[] = { 1, -125, 0, 5, -75, 0, 9, -125, 0, 1, 0, 0, 9, 0, 0, 1, 0, 0, 9, 0, 0, 1, 0, 0, 9, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_putaway1[] = { { cKF_ckcb_r_ply_1_putaway1_tbl, cKF_ds_ply_1_putaway1_tbl, - cKF_kn_ply_1_putaway1_tbl, cKF_c_ply_1_putaway1_tbl, -1, 9 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_putaway1 = { + cKF_ckcb_r_ply_1_putaway1_tbl, cKF_ds_ply_1_putaway1_tbl, cKF_kn_ply_1_putaway1_tbl, cKF_c_ply_1_putaway1_tbl, -1, 9 +}; u8 cKF_ckcb_r_ply_1_trans_wait1_tbl[] = { 16, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -645,9 +666,12 @@ s16 cKF_ds_ply_1_trans_wait1_tbl[] = { 17, 0, 0, 1, 0, 0, 17, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_trans_wait1[] = { { cKF_ckcb_r_ply_1_trans_wait1_tbl, cKF_ds_ply_1_trans_wait1_tbl, - cKF_kn_ply_1_trans_wait1_tbl, cKF_c_ply_1_trans_wait1_tbl, -1, - 17 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_trans_wait1 = { cKF_ckcb_r_ply_1_trans_wait1_tbl, + cKF_ds_ply_1_trans_wait1_tbl, + cKF_kn_ply_1_trans_wait1_tbl, + cKF_c_ply_1_trans_wait1_tbl, + -1, + 17 }; u8 cKF_ckcb_r_ply_1_transfer1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -708,8 +732,12 @@ s16 cKF_ds_ply_1_transfer1_tbl[] = { 1, 0, 0, 39, 0, 0, 1, 0, 0, 39, 0, 0, 1, 0, 0, 39, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_transfer1[] = { { cKF_ckcb_r_ply_1_transfer1_tbl, cKF_ds_ply_1_transfer1_tbl, - cKF_kn_ply_1_transfer1_tbl, cKF_c_ply_1_transfer1_tbl, -1, 39 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_transfer1 = { cKF_ckcb_r_ply_1_transfer1_tbl, + cKF_ds_ply_1_transfer1_tbl, + cKF_kn_ply_1_transfer1_tbl, + cKF_c_ply_1_transfer1_tbl, + -1, + 39 }; u8 cKF_ckcb_r_ply_1_umb_open1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -757,8 +785,12 @@ s16 cKF_ds_ply_1_umb_open1_tbl[] = { 1, 0, 0, 26, 0, 0, 1, 0, 0, 26, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_umb_open1[] = { { cKF_ckcb_r_ply_1_umb_open1_tbl, cKF_ds_ply_1_umb_open1_tbl, - cKF_kn_ply_1_umb_open1_tbl, cKF_c_ply_1_umb_open1_tbl, -1, 26 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_umb_open1 = { cKF_ckcb_r_ply_1_umb_open1_tbl, + cKF_ds_ply_1_umb_open1_tbl, + cKF_kn_ply_1_umb_open1_tbl, + cKF_c_ply_1_umb_open1_tbl, + -1, + 26 }; u8 cKF_ckcb_r_ply_1_umbrella1_tbl[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -769,8 +801,8 @@ s16 cKF_c_ply_1_umbrella1_tbl[] = { 0, 1000, 0, 0, 0, 900, 0, 0, 900, -170, -365, 540, -200, -1060, 420, -8, -50, -350, 0, 0, 0, 0, -900, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_umbrella1[] = { { cKF_ckcb_r_ply_1_umbrella1_tbl, NULL, NULL, - cKF_c_ply_1_umbrella1_tbl, -1, 2 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_umbrella1 = { cKF_ckcb_r_ply_1_umbrella1_tbl, NULL, NULL, + cKF_c_ply_1_umbrella1_tbl, -1, 2 }; u8 cKF_ckcb_r_ply_1_dash1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -812,8 +844,9 @@ s16 cKF_ds_ply_1_dash1_tbl[] = { 1, 0, 0, 17, 0, 0, 1, 0, 0, 17, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_dash1[] = { { cKF_ckcb_r_ply_1_dash1_tbl, cKF_ds_ply_1_dash1_tbl, - cKF_kn_ply_1_dash1_tbl, cKF_c_ply_1_dash1_tbl, -1, 17 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_dash1 = { + cKF_ckcb_r_ply_1_dash1_tbl, cKF_ds_ply_1_dash1_tbl, cKF_kn_ply_1_dash1_tbl, cKF_c_ply_1_dash1_tbl, -1, 17 +}; u8 cKF_ckcb_r_ply_1_run_slip1_tbl[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -824,8 +857,8 @@ s16 cKF_c_ply_1_run_slip1_tbl[] = { 0, 1200, 0, 0, 0, 900, -600, 400 900, 0, 150, 0, 0, -450, 0, 0, 158, 0, 200, 0, -160, 0, -900, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_run_slip1[] = { { cKF_ckcb_r_ply_1_run_slip1_tbl, NULL, NULL, - cKF_c_ply_1_run_slip1_tbl, -1, 2 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_run_slip1 = { cKF_ckcb_r_ply_1_run_slip1_tbl, NULL, NULL, + cKF_c_ply_1_run_slip1_tbl, -1, 2 }; u8 cKF_ckcb_r_ply_1_get_pull1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -855,8 +888,12 @@ s16 cKF_ds_ply_1_get_pull1_tbl[] = { 11, 0, 0, 1, 0, 0, 11, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_get_pull1[] = { { cKF_ckcb_r_ply_1_get_pull1_tbl, cKF_ds_ply_1_get_pull1_tbl, - cKF_kn_ply_1_get_pull1_tbl, cKF_c_ply_1_get_pull1_tbl, -1, 11 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_get_pull1 = { cKF_ckcb_r_ply_1_get_pull1_tbl, + cKF_ds_ply_1_get_pull1_tbl, + cKF_kn_ply_1_get_pull1_tbl, + cKF_c_ply_1_get_pull1_tbl, + -1, + 11 }; u8 cKF_ckcb_r_ply_1_get_m1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -922,8 +959,9 @@ s16 cKF_ds_ply_1_get_m1_tbl[] = { 52, 0, 0, 1, 0, 0, 52, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_get_m1[] = { { cKF_ckcb_r_ply_1_get_m1_tbl, cKF_ds_ply_1_get_m1_tbl, - cKF_kn_ply_1_get_m1_tbl, cKF_c_ply_1_get_m1_tbl, -1, 52 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_get_m1 = { + cKF_ckcb_r_ply_1_get_m1_tbl, cKF_ds_ply_1_get_m1_tbl, cKF_kn_ply_1_get_m1_tbl, cKF_c_ply_1_get_m1_tbl, -1, 52 +}; u8 cKF_ckcb_r_ply_1_kamae_move_m1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -969,9 +1007,12 @@ s16 cKF_ds_ply_1_kamae_move_m1_tbl[] = { 17, 0, 0, 1, 0, 0, 17, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_kamae_move_m1[] = { { cKF_ckcb_r_ply_1_kamae_move_m1_tbl, - cKF_ds_ply_1_kamae_move_m1_tbl, cKF_kn_ply_1_kamae_move_m1_tbl, - cKF_c_ply_1_kamae_move_m1_tbl, -1, 17 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_kamae_move_m1 = { cKF_ckcb_r_ply_1_kamae_move_m1_tbl, + cKF_ds_ply_1_kamae_move_m1_tbl, + cKF_kn_ply_1_kamae_move_m1_tbl, + cKF_c_ply_1_kamae_move_m1_tbl, + -1, + 17 }; u8 cKF_ckcb_r_ply_1_kamae_wait_m1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -1008,9 +1049,12 @@ s16 cKF_ds_ply_1_kamae_wait_m1_tbl[] = { 1, 0, 0, 17, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_kamae_wait_m1[] = { { cKF_ckcb_r_ply_1_kamae_wait_m1_tbl, - cKF_ds_ply_1_kamae_wait_m1_tbl, cKF_kn_ply_1_kamae_wait_m1_tbl, - cKF_c_ply_1_kamae_wait_m1_tbl, -1, 17 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_kamae_wait_m1 = { cKF_ckcb_r_ply_1_kamae_wait_m1_tbl, + cKF_ds_ply_1_kamae_wait_m1_tbl, + cKF_kn_ply_1_kamae_wait_m1_tbl, + cKF_c_ply_1_kamae_wait_m1_tbl, + -1, + 17 }; u8 cKF_ckcb_r_ply_1_kokeru_a1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -1054,8 +1098,12 @@ s16 cKF_ds_ply_1_kokeru_a1_tbl[] = { 17, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_kokeru_a1[] = { { cKF_ckcb_r_ply_1_kokeru_a1_tbl, cKF_ds_ply_1_kokeru_a1_tbl, - cKF_kn_ply_1_kokeru_a1_tbl, cKF_c_ply_1_kokeru_a1_tbl, -1, 17 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_kokeru_a1 = { cKF_ckcb_r_ply_1_kokeru_a1_tbl, + cKF_ds_ply_1_kokeru_a1_tbl, + cKF_kn_ply_1_kokeru_a1_tbl, + cKF_c_ply_1_kokeru_a1_tbl, + -1, + 17 }; u8 ply_1_kokeru_a11_tex_index[] = { 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5 }; @@ -1113,10 +1161,12 @@ s16 cKF_ds_ply_1_kokeru_getup_a1_tbl[] = { 1, 0, 0, 32, 0, 0, 1, 0, 0, 32, 0, 0, 1, 0, 0, 32, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_kokeru_getup_a1[] = { - { cKF_ckcb_r_ply_1_kokeru_getup_a1_tbl, cKF_ds_ply_1_kokeru_getup_a1_tbl, cKF_kn_ply_1_kokeru_getup_a1_tbl, - cKF_c_ply_1_kokeru_getup_a1_tbl, -1, 32 } -}; +cKF_Animation_R_c cKF_ba_r_ply_1_kokeru_getup_a1 = { cKF_ckcb_r_ply_1_kokeru_getup_a1_tbl, + cKF_ds_ply_1_kokeru_getup_a1_tbl, + cKF_kn_ply_1_kokeru_getup_a1_tbl, + cKF_c_ply_1_kokeru_getup_a1_tbl, + -1, + 32 }; u8 ply_1_kokeru_getup_a11_tex_index[] = { 5, 5, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 }; @@ -1174,10 +1224,12 @@ s16 cKF_ds_ply_1_kokeru_getup_n1_tbl[] = { 1, 0, 0, 32, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_kokeru_getup_n1[] = { - { cKF_ckcb_r_ply_1_kokeru_getup_n1_tbl, cKF_ds_ply_1_kokeru_getup_n1_tbl, cKF_kn_ply_1_kokeru_getup_n1_tbl, - cKF_c_ply_1_kokeru_getup_n1_tbl, -1, 32 } -}; +cKF_Animation_R_c cKF_ba_r_ply_1_kokeru_getup_n1 = { cKF_ckcb_r_ply_1_kokeru_getup_n1_tbl, + cKF_ds_ply_1_kokeru_getup_n1_tbl, + cKF_kn_ply_1_kokeru_getup_n1_tbl, + cKF_c_ply_1_kokeru_getup_n1_tbl, + -1, + 32 }; u8 ply_1_kokeru_getup_n11_tex_index[] = { 5, 5, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 }; @@ -1226,8 +1278,12 @@ s16 cKF_ds_ply_1_kokeru_n1_tbl[] = { 17, 0, 0, 1, 0, 0, 17, 0, 0, 1, 0, 0, 17, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_kokeru_n1[] = { { cKF_ckcb_r_ply_1_kokeru_n1_tbl, cKF_ds_ply_1_kokeru_n1_tbl, - cKF_kn_ply_1_kokeru_n1_tbl, cKF_c_ply_1_kokeru_n1_tbl, -1, 17 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_kokeru_n1 = { cKF_ckcb_r_ply_1_kokeru_n1_tbl, + cKF_ds_ply_1_kokeru_n1_tbl, + cKF_kn_ply_1_kokeru_n1_tbl, + cKF_c_ply_1_kokeru_n1_tbl, + -1, + 17 }; u8 ply_1_kokeru_n11_tex_index[] = { 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5 }; @@ -1242,7 +1298,7 @@ s16 cKF_c_ply_1_net1_tbl[] = { 0, 1000, 0, 0, 0, 900, 0, 0, 0 900, -300, -130, 320, -800, -1290, 1040, 475, -350, -245, 0, 0, 0, 0, -900, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_net1[] = { { cKF_ckcb_r_ply_1_net1_tbl, NULL, NULL, cKF_c_ply_1_net1_tbl, -1, 2 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_net1 = { cKF_ckcb_r_ply_1_net1_tbl, NULL, NULL, cKF_c_ply_1_net1_tbl, -1, 2 }; u8 cKF_ckcb_r_ply_1_net_swing1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -1291,8 +1347,12 @@ s16 cKF_ds_ply_1_net_swing1_tbl[] = { 10, 0, 0, 1, 0, 0, 10, 0, 0, 1, 0, 0, 10, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_net_swing1[] = { { cKF_ckcb_r_ply_1_net_swing1_tbl, cKF_ds_ply_1_net_swing1_tbl, - cKF_kn_ply_1_net_swing1_tbl, cKF_c_ply_1_net_swing1_tbl, -1, 10 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_net_swing1 = { cKF_ckcb_r_ply_1_net_swing1_tbl, + cKF_ds_ply_1_net_swing1_tbl, + cKF_kn_ply_1_net_swing1_tbl, + cKF_c_ply_1_net_swing1_tbl, + -1, + 10 }; u8 cKF_ckcb_r_ply_1_axe_swing1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -1359,8 +1419,12 @@ s16 cKF_ds_ply_1_axe_swing1_tbl[] = { 30, 0, 0, 1, 0, 0, 30, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_axe_swing1[] = { { cKF_ckcb_r_ply_1_axe_swing1_tbl, cKF_ds_ply_1_axe_swing1_tbl, - cKF_kn_ply_1_axe_swing1_tbl, cKF_c_ply_1_axe_swing1_tbl, -1, 30 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_axe_swing1 = { cKF_ckcb_r_ply_1_axe_swing1_tbl, + cKF_ds_ply_1_axe_swing1_tbl, + cKF_kn_ply_1_axe_swing1_tbl, + cKF_c_ply_1_axe_swing1_tbl, + -1, + 30 }; u8 ply_1_axe_swing11_tex_index[] = { 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0 }; @@ -1379,8 +1443,8 @@ s16 cKF_c_ply_1_kamae_slip_m1_tbl[] = { 850, -70, 100, 700, -40, 50, 0, -900, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_kamae_slip_m1[] = { { cKF_ckcb_r_ply_1_kamae_slip_m1_tbl, NULL, NULL, - cKF_c_ply_1_kamae_slip_m1_tbl, -1, 2 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_kamae_slip_m1 = { cKF_ckcb_r_ply_1_kamae_slip_m1_tbl, NULL, NULL, + cKF_c_ply_1_kamae_slip_m1_tbl, -1, 2 }; u8 cKF_ckcb_r_ply_1_kokeru1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -1422,8 +1486,9 @@ s16 cKF_ds_ply_1_kokeru1_tbl[] = { 1, 0, 0, 17, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_kokeru1[] = { { cKF_ckcb_r_ply_1_kokeru1_tbl, cKF_ds_ply_1_kokeru1_tbl, - cKF_kn_ply_1_kokeru1_tbl, cKF_c_ply_1_kokeru1_tbl, -1, 17 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_kokeru1 = { + cKF_ckcb_r_ply_1_kokeru1_tbl, cKF_ds_ply_1_kokeru1_tbl, cKF_kn_ply_1_kokeru1_tbl, cKF_c_ply_1_kokeru1_tbl, -1, 17 +}; u8 ply_1_kokeru11_tex_index[] = { 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5 }; @@ -1477,9 +1542,12 @@ s16 cKF_ds_ply_1_kokeru_getup1_tbl[] = { 32, 0, 0, 1, 0, 0, 32, 0, 0, 1, 0, 0, 32, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_kokeru_getup1[] = { { cKF_ckcb_r_ply_1_kokeru_getup1_tbl, - cKF_ds_ply_1_kokeru_getup1_tbl, cKF_kn_ply_1_kokeru_getup1_tbl, - cKF_c_ply_1_kokeru_getup1_tbl, -1, 32 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_kokeru_getup1 = { cKF_ckcb_r_ply_1_kokeru_getup1_tbl, + cKF_ds_ply_1_kokeru_getup1_tbl, + cKF_kn_ply_1_kokeru_getup1_tbl, + cKF_c_ply_1_kokeru_getup1_tbl, + -1, + 32 }; u8 ply_1_kokeru_getup11_tex_index[] = { 5, 5, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 }; @@ -1547,8 +1615,12 @@ s16 cKF_ds_ply_1_sitdown1_tbl[] = { 1, 0, 0, 3, 0, 0, 25, 0, 0, 1, 0, 0, 3, 0, 0, 25, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_sitdown1[] = { { cKF_ckcb_r_ply_1_sitdown1_tbl, cKF_ds_ply_1_sitdown1_tbl, - cKF_kn_ply_1_sitdown1_tbl, cKF_c_ply_1_sitdown1_tbl, -1, 25 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_sitdown1 = { cKF_ckcb_r_ply_1_sitdown1_tbl, + cKF_ds_ply_1_sitdown1_tbl, + cKF_kn_ply_1_sitdown1_tbl, + cKF_c_ply_1_sitdown1_tbl, + -1, + 25 }; u8 cKF_ckcb_r_ply_1_sitdown_wait1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -1584,9 +1656,12 @@ s16 cKF_ds_ply_1_sitdown_wait1_tbl[] = { 31, 0, 0, 1, 0, 0, 31, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_sitdown_wait1[] = { { cKF_ckcb_r_ply_1_sitdown_wait1_tbl, - cKF_ds_ply_1_sitdown_wait1_tbl, cKF_kn_ply_1_sitdown_wait1_tbl, - cKF_c_ply_1_sitdown_wait1_tbl, -1, 31 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_sitdown_wait1 = { cKF_ckcb_r_ply_1_sitdown_wait1_tbl, + cKF_ds_ply_1_sitdown_wait1_tbl, + cKF_kn_ply_1_sitdown_wait1_tbl, + cKF_c_ply_1_sitdown_wait1_tbl, + -1, + 31 }; u8 cKF_ckcb_r_ply_1_standup1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -1641,8 +1716,12 @@ s16 cKF_ds_ply_1_standup1_tbl[] = { 27, 0, 0, 1, 0, 0, 27, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_standup1[] = { { cKF_ckcb_r_ply_1_standup1_tbl, cKF_ds_ply_1_standup1_tbl, - cKF_kn_ply_1_standup1_tbl, cKF_c_ply_1_standup1_tbl, -1, 27 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_standup1 = { cKF_ckcb_r_ply_1_standup1_tbl, + cKF_ds_ply_1_standup1_tbl, + cKF_kn_ply_1_standup1_tbl, + cKF_c_ply_1_standup1_tbl, + -1, + 27 }; u8 cKF_ckcb_r_ply_1_putaway_m1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -1677,8 +1756,12 @@ s16 cKF_ds_ply_1_putaway_m1_tbl[] = { 16, 75, 0, 19, 100, 0, 1, 0, 0, 19, 0, 0, 1, 0, 0, 19, 0, 0, 1, 0, 0, 19, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_putaway_m1[] = { { cKF_ckcb_r_ply_1_putaway_m1_tbl, cKF_ds_ply_1_putaway_m1_tbl, - cKF_kn_ply_1_putaway_m1_tbl, cKF_c_ply_1_putaway_m1_tbl, -1, 19 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_putaway_m1 = { cKF_ckcb_r_ply_1_putaway_m1_tbl, + cKF_ds_ply_1_putaway_m1_tbl, + cKF_kn_ply_1_putaway_m1_tbl, + cKF_c_ply_1_putaway_m1_tbl, + -1, + 19 }; u8 cKF_ckcb_r_ply_1_bed_wait1_tbl[] = { 63, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -1709,8 +1792,12 @@ s16 cKF_ds_ply_1_bed_wait1_tbl[] = { 49, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_bed_wait1[] = { { cKF_ckcb_r_ply_1_bed_wait1_tbl, cKF_ds_ply_1_bed_wait1_tbl, - cKF_kn_ply_1_bed_wait1_tbl, cKF_c_ply_1_bed_wait1_tbl, -1, 49 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_bed_wait1 = { cKF_ckcb_r_ply_1_bed_wait1_tbl, + cKF_ds_ply_1_bed_wait1_tbl, + cKF_kn_ply_1_bed_wait1_tbl, + cKF_c_ply_1_bed_wait1_tbl, + -1, + 49 }; u8 cKF_ckcb_r_ply_1_inbed_L1_tbl[] = { 63, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -1770,8 +1857,12 @@ s16 cKF_ds_ply_1_inbed_L1_tbl[] = { 37, 0, 0, 1, 0, 0, 37, 0, 0, 1, 0, 0, 37, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_inbed_L1[] = { { cKF_ckcb_r_ply_1_inbed_L1_tbl, cKF_ds_ply_1_inbed_L1_tbl, - cKF_kn_ply_1_inbed_L1_tbl, cKF_c_ply_1_inbed_L1_tbl, -1, 37 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_inbed_L1 = { cKF_ckcb_r_ply_1_inbed_L1_tbl, + cKF_ds_ply_1_inbed_L1_tbl, + cKF_kn_ply_1_inbed_L1_tbl, + cKF_c_ply_1_inbed_L1_tbl, + -1, + 37 }; u8 cKF_ckcb_r_ply_1_inbed_R1_tbl[] = { 63, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -1832,8 +1923,12 @@ s16 cKF_ds_ply_1_inbed_R1_tbl[] = { 37, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_inbed_R1[] = { { cKF_ckcb_r_ply_1_inbed_R1_tbl, cKF_ds_ply_1_inbed_R1_tbl, - cKF_kn_ply_1_inbed_R1_tbl, cKF_c_ply_1_inbed_R1_tbl, -1, 37 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_inbed_R1 = { cKF_ckcb_r_ply_1_inbed_R1_tbl, + cKF_ds_ply_1_inbed_R1_tbl, + cKF_kn_ply_1_inbed_R1_tbl, + cKF_c_ply_1_inbed_R1_tbl, + -1, + 37 }; u8 cKF_ckcb_r_ply_1_intrain1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -1919,8 +2014,12 @@ s16 cKF_ds_ply_1_intrain1_tbl[] = { 1, 0, 0, 131, 0, 0, 1, 0, 0, 131, 0, 0, 1, 0, 0, 131, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_intrain1[] = { { cKF_ckcb_r_ply_1_intrain1_tbl, cKF_ds_ply_1_intrain1_tbl, - cKF_kn_ply_1_intrain1_tbl, cKF_c_ply_1_intrain1_tbl, -1, 131 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_intrain1 = { cKF_ckcb_r_ply_1_intrain1_tbl, + cKF_ds_ply_1_intrain1_tbl, + cKF_kn_ply_1_intrain1_tbl, + cKF_c_ply_1_intrain1_tbl, + -1, + 131 }; u8 cKF_ckcb_r_ply_1_kagu_open_d1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -1975,9 +2074,12 @@ s16 cKF_ds_ply_1_kagu_open_d1_tbl[] = { 16, 0, 0, 1, 0, 0, 16, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_kagu_open_d1[] = { { cKF_ckcb_r_ply_1_kagu_open_d1_tbl, cKF_ds_ply_1_kagu_open_d1_tbl, - cKF_kn_ply_1_kagu_open_d1_tbl, cKF_c_ply_1_kagu_open_d1_tbl, -1, - 16 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_kagu_open_d1 = { cKF_ckcb_r_ply_1_kagu_open_d1_tbl, + cKF_ds_ply_1_kagu_open_d1_tbl, + cKF_kn_ply_1_kagu_open_d1_tbl, + cKF_c_ply_1_kagu_open_d1_tbl, + -1, + 16 }; u8 cKF_ckcb_r_ply_1_kagu_open_h1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -2015,9 +2117,12 @@ s16 cKF_ds_ply_1_kagu_open_h1_tbl[] = { 10, 0, 0, 1, 0, 0, 10, 0, 0, 1, 0, 0, 10, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_kagu_open_h1[] = { { cKF_ckcb_r_ply_1_kagu_open_h1_tbl, cKF_ds_ply_1_kagu_open_h1_tbl, - cKF_kn_ply_1_kagu_open_h1_tbl, cKF_c_ply_1_kagu_open_h1_tbl, -1, - 10 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_kagu_open_h1 = { cKF_ckcb_r_ply_1_kagu_open_h1_tbl, + cKF_ds_ply_1_kagu_open_h1_tbl, + cKF_kn_ply_1_kagu_open_h1_tbl, + cKF_c_ply_1_kagu_open_h1_tbl, + -1, + 10 }; u8 cKF_ckcb_r_ply_1_kagu_open_k1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -2053,9 +2158,12 @@ s16 cKF_ds_ply_1_kagu_open_k1_tbl[] = { 12, 0, 0, 1, 0, 0, 12, 0, 0, 1, 0, 0, 12, 0, 0, 1, 0, 0, 12, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_kagu_open_k1[] = { { cKF_ckcb_r_ply_1_kagu_open_k1_tbl, cKF_ds_ply_1_kagu_open_k1_tbl, - cKF_kn_ply_1_kagu_open_k1_tbl, cKF_c_ply_1_kagu_open_k1_tbl, -1, - 12 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_kagu_open_k1 = { cKF_ckcb_r_ply_1_kagu_open_k1_tbl, + cKF_ds_ply_1_kagu_open_k1_tbl, + cKF_kn_ply_1_kagu_open_k1_tbl, + cKF_c_ply_1_kagu_open_k1_tbl, + -1, + 12 }; u8 cKF_ckcb_r_ply_1_negaeri_L1_tbl[] = { 63, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -2112,8 +2220,12 @@ s16 cKF_ds_ply_1_negaeri_L1_tbl[] = { 33, 0, 0, 1, 0, 0, 33, 0, 0, 1, 0, 0, 33, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_negaeri_L1[] = { { cKF_ckcb_r_ply_1_negaeri_L1_tbl, cKF_ds_ply_1_negaeri_L1_tbl, - cKF_kn_ply_1_negaeri_L1_tbl, cKF_c_ply_1_negaeri_L1_tbl, -1, 33 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_negaeri_L1 = { cKF_ckcb_r_ply_1_negaeri_L1_tbl, + cKF_ds_ply_1_negaeri_L1_tbl, + cKF_kn_ply_1_negaeri_L1_tbl, + cKF_c_ply_1_negaeri_L1_tbl, + -1, + 33 }; u8 cKF_ckcb_r_ply_1_negaeri_R1_tbl[] = { 63, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -2170,8 +2282,12 @@ s16 cKF_ds_ply_1_negaeri_R1_tbl[] = { 33, 0, 0, 1, 0, 0, 33, 0, 0, 1, 0, 0, 33, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_negaeri_R1[] = { { cKF_ckcb_r_ply_1_negaeri_R1_tbl, cKF_ds_ply_1_negaeri_R1_tbl, - cKF_kn_ply_1_negaeri_R1_tbl, cKF_c_ply_1_negaeri_R1_tbl, -1, 33 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_negaeri_R1 = { cKF_ckcb_r_ply_1_negaeri_R1_tbl, + cKF_ds_ply_1_negaeri_R1_tbl, + cKF_kn_ply_1_negaeri_R1_tbl, + cKF_c_ply_1_negaeri_R1_tbl, + -1, + 33 }; u8 cKF_ckcb_r_ply_1_outbed_L1_tbl[] = { 63, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -2233,8 +2349,12 @@ s16 cKF_ds_ply_1_outbed_L1_tbl[] = { 33, 0, 0, 1, 0, 0, 33, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_outbed_L1[] = { { cKF_ckcb_r_ply_1_outbed_L1_tbl, cKF_ds_ply_1_outbed_L1_tbl, - cKF_kn_ply_1_outbed_L1_tbl, cKF_c_ply_1_outbed_L1_tbl, -1, 33 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_outbed_L1 = { cKF_ckcb_r_ply_1_outbed_L1_tbl, + cKF_ds_ply_1_outbed_L1_tbl, + cKF_kn_ply_1_outbed_L1_tbl, + cKF_c_ply_1_outbed_L1_tbl, + -1, + 33 }; u8 cKF_ckcb_r_ply_1_outbed_R1_tbl[] = { 63, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -2296,8 +2416,12 @@ s16 cKF_ds_ply_1_outbed_R1_tbl[] = { 33, 0, 0, 1, 0, 0, 33, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_outbed_R1[] = { { cKF_ckcb_r_ply_1_outbed_R1_tbl, cKF_ds_ply_1_outbed_R1_tbl, - cKF_kn_ply_1_outbed_R1_tbl, cKF_c_ply_1_outbed_R1_tbl, -1, 33 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_outbed_R1 = { cKF_ckcb_r_ply_1_outbed_R1_tbl, + cKF_ds_ply_1_outbed_R1_tbl, + cKF_kn_ply_1_outbed_R1_tbl, + cKF_c_ply_1_outbed_R1_tbl, + -1, + 33 }; u8 cKF_ckcb_r_ply_1_outtrain1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -2350,8 +2474,12 @@ s16 cKF_ds_ply_1_outtrain1_tbl[] = { 29, 0, 0, 1, 0, 0, 29, 0, 0, 1, 0, 0, 29, 0, 0, 1, 0, 0, 29, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_outtrain1[] = { { cKF_ckcb_r_ply_1_outtrain1_tbl, cKF_ds_ply_1_outtrain1_tbl, - cKF_kn_ply_1_outtrain1_tbl, cKF_c_ply_1_outtrain1_tbl, -1, 29 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_outtrain1 = { cKF_ckcb_r_ply_1_outtrain1_tbl, + cKF_ds_ply_1_outtrain1_tbl, + cKF_kn_ply_1_outtrain1_tbl, + cKF_c_ply_1_outtrain1_tbl, + -1, + 29 }; u8 cKF_ckcb_r_ply_1_kagu_close_d1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -2400,9 +2528,12 @@ s16 cKF_ds_ply_1_kagu_close_d1_tbl[] = { 16, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_kagu_close_d1[] = { { cKF_ckcb_r_ply_1_kagu_close_d1_tbl, - cKF_ds_ply_1_kagu_close_d1_tbl, cKF_kn_ply_1_kagu_close_d1_tbl, - cKF_c_ply_1_kagu_close_d1_tbl, -1, 16 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_kagu_close_d1 = { cKF_ckcb_r_ply_1_kagu_close_d1_tbl, + cKF_ds_ply_1_kagu_close_d1_tbl, + cKF_kn_ply_1_kagu_close_d1_tbl, + cKF_c_ply_1_kagu_close_d1_tbl, + -1, + 16 }; u8 cKF_ckcb_r_ply_1_kagu_close_h1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -2435,9 +2566,12 @@ s16 cKF_ds_ply_1_kagu_close_h1_tbl[] = { 10, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_kagu_close_h1[] = { { cKF_ckcb_r_ply_1_kagu_close_h1_tbl, - cKF_ds_ply_1_kagu_close_h1_tbl, cKF_kn_ply_1_kagu_close_h1_tbl, - cKF_c_ply_1_kagu_close_h1_tbl, -1, 10 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_kagu_close_h1 = { cKF_ckcb_r_ply_1_kagu_close_h1_tbl, + cKF_ds_ply_1_kagu_close_h1_tbl, + cKF_kn_ply_1_kagu_close_h1_tbl, + cKF_c_ply_1_kagu_close_h1_tbl, + -1, + 10 }; u8 cKF_ckcb_r_ply_1_kagu_close_k1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -2472,9 +2606,12 @@ s16 cKF_ds_ply_1_kagu_close_k1_tbl[] = { 12, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_kagu_close_k1[] = { { cKF_ckcb_r_ply_1_kagu_close_k1_tbl, - cKF_ds_ply_1_kagu_close_k1_tbl, cKF_kn_ply_1_kagu_close_k1_tbl, - cKF_c_ply_1_kagu_close_k1_tbl, -1, 12 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_kagu_close_k1 = { cKF_ckcb_r_ply_1_kagu_close_k1_tbl, + cKF_ds_ply_1_kagu_close_k1_tbl, + cKF_kn_ply_1_kagu_close_k1_tbl, + cKF_c_ply_1_kagu_close_k1_tbl, + -1, + 12 }; u8 cKF_ckcb_r_ply_1_kagu_wait_d1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -2514,9 +2651,12 @@ s16 cKF_ds_ply_1_kagu_wait_d1_tbl[] = { 29, 0, 0, 1, 0, 0, 29, 0, 0, 1, 0, 0, 29, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_kagu_wait_d1[] = { { cKF_ckcb_r_ply_1_kagu_wait_d1_tbl, cKF_ds_ply_1_kagu_wait_d1_tbl, - cKF_kn_ply_1_kagu_wait_d1_tbl, cKF_c_ply_1_kagu_wait_d1_tbl, -1, - 29 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_kagu_wait_d1 = { cKF_ckcb_r_ply_1_kagu_wait_d1_tbl, + cKF_ds_ply_1_kagu_wait_d1_tbl, + cKF_kn_ply_1_kagu_wait_d1_tbl, + cKF_c_ply_1_kagu_wait_d1_tbl, + -1, + 29 }; u8 cKF_ckcb_r_ply_1_kagu_wait_h1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -2554,9 +2694,12 @@ s16 cKF_ds_ply_1_kagu_wait_h1_tbl[] = { 29, 0, 0, 1, 0, 0, 29, 0, 0, 1, 0, 0, 29, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_kagu_wait_h1[] = { { cKF_ckcb_r_ply_1_kagu_wait_h1_tbl, cKF_ds_ply_1_kagu_wait_h1_tbl, - cKF_kn_ply_1_kagu_wait_h1_tbl, cKF_c_ply_1_kagu_wait_h1_tbl, -1, - 29 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_kagu_wait_h1 = { cKF_ckcb_r_ply_1_kagu_wait_h1_tbl, + cKF_ds_ply_1_kagu_wait_h1_tbl, + cKF_kn_ply_1_kagu_wait_h1_tbl, + cKF_c_ply_1_kagu_wait_h1_tbl, + -1, + 29 }; u8 cKF_ckcb_r_ply_1_kagu_wait_k1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -2594,9 +2737,12 @@ s16 cKF_ds_ply_1_kagu_wait_k1_tbl[] = { 29, 0, 0, 1, 0, 0, 29, 0, 0, 1, 0, 0, 29, 0, 0, 1, 0, 0, 29, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_kagu_wait_k1[] = { { cKF_ckcb_r_ply_1_kagu_wait_k1_tbl, cKF_ds_ply_1_kagu_wait_k1_tbl, - cKF_kn_ply_1_kagu_wait_k1_tbl, cKF_c_ply_1_kagu_wait_k1_tbl, -1, - 29 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_kagu_wait_k1 = { cKF_ckcb_r_ply_1_kagu_wait_k1_tbl, + cKF_ds_ply_1_kagu_wait_k1_tbl, + cKF_kn_ply_1_kagu_wait_k1_tbl, + cKF_c_ply_1_kagu_wait_k1_tbl, + -1, + 29 }; u8 cKF_ckcb_r_ply_1_go_out_o1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -2669,8 +2815,12 @@ s16 cKF_ds_ply_1_go_out_o1_tbl[] = { 1, 0, 0, 59, 0, 0, 1, 0, 0, 59, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_go_out_o1[] = { { cKF_ckcb_r_ply_1_go_out_o1_tbl, cKF_ds_ply_1_go_out_o1_tbl, - cKF_kn_ply_1_go_out_o1_tbl, cKF_c_ply_1_go_out_o1_tbl, -1, 59 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_go_out_o1 = { cKF_ckcb_r_ply_1_go_out_o1_tbl, + cKF_ds_ply_1_go_out_o1_tbl, + cKF_kn_ply_1_go_out_o1_tbl, + cKF_c_ply_1_go_out_o1_tbl, + -1, + 59 }; u8 cKF_ckcb_r_ply_1_go_out_s1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -2716,8 +2866,12 @@ s16 cKF_ds_ply_1_go_out_s1_tbl[] = { 31, 0, 0, 1, 0, 0, 31, 0, 0, 1, 0, 0, 31, 0, 0, 1, 0, 0, 31, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_go_out_s1[] = { { cKF_ckcb_r_ply_1_go_out_s1_tbl, cKF_ds_ply_1_go_out_s1_tbl, - cKF_kn_ply_1_go_out_s1_tbl, cKF_c_ply_1_go_out_s1_tbl, -1, 31 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_go_out_s1 = { cKF_ckcb_r_ply_1_go_out_s1_tbl, + cKF_ds_ply_1_go_out_s1_tbl, + cKF_kn_ply_1_go_out_s1_tbl, + cKF_c_ply_1_go_out_s1_tbl, + -1, + 31 }; u8 cKF_ckcb_r_ply_1_into_s1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -2759,8 +2913,9 @@ s16 cKF_ds_ply_1_into_s1_tbl[] = { 49, -40, 0, 1, 0, 0, 49, 0, 0, 1, 0, 0, 49, 0, 0, 1, 0, 0, 49, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_into_s1[] = { { cKF_ckcb_r_ply_1_into_s1_tbl, cKF_ds_ply_1_into_s1_tbl, - cKF_kn_ply_1_into_s1_tbl, cKF_c_ply_1_into_s1_tbl, -1, 49 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_into_s1 = { + cKF_ckcb_r_ply_1_into_s1_tbl, cKF_ds_ply_1_into_s1_tbl, cKF_kn_ply_1_into_s1_tbl, cKF_c_ply_1_into_s1_tbl, -1, 49 +}; u8 cKF_ckcb_r_ply_1_axe_hane1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -2832,8 +2987,12 @@ s16 cKF_ds_ply_1_axe_hane1_tbl[] = { 1, 0, 0, 38, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_axe_hane1[] = { { cKF_ckcb_r_ply_1_axe_hane1_tbl, cKF_ds_ply_1_axe_hane1_tbl, - cKF_kn_ply_1_axe_hane1_tbl, cKF_c_ply_1_axe_hane1_tbl, -1, 38 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_axe_hane1 = { cKF_ckcb_r_ply_1_axe_hane1_tbl, + cKF_ds_ply_1_axe_hane1_tbl, + cKF_kn_ply_1_axe_hane1_tbl, + cKF_c_ply_1_axe_hane1_tbl, + -1, + 38 }; u8 ply_1_axe_hane11_tex_index[] = { 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 3, 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -2909,8 +3068,12 @@ s16 cKF_ds_ply_1_axe_suka1_tbl[] = { 1, 0, 0, 41, 0, 0, 1, 0, 0, 41, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_axe_suka1[] = { { cKF_ckcb_r_ply_1_axe_suka1_tbl, cKF_ds_ply_1_axe_suka1_tbl, - cKF_kn_ply_1_axe_suka1_tbl, cKF_c_ply_1_axe_suka1_tbl, -1, 41 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_axe_suka1 = { cKF_ckcb_r_ply_1_axe_suka1_tbl, + cKF_ds_ply_1_axe_suka1_tbl, + cKF_kn_ply_1_axe_suka1_tbl, + cKF_c_ply_1_axe_suka1_tbl, + -1, + 41 }; u8 ply_1_axe_suka11_tex_index[] = { 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 3, 3, 3, 3, 3, 0 }; @@ -2929,8 +3092,8 @@ s16 cKF_c_ply_1_hold_wait_h1_tbl[] = { 0, 1000, 200, 0, 0, 900, 50, 0, 900, -900, -850, 900, 0, 0, 100, 0, 0, 0, 0, -160, 0, 0, -900, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_hold_wait_h1[] = { { cKF_ckcb_r_ply_1_hold_wait_h1_tbl, NULL, NULL, - cKF_c_ply_1_hold_wait_h1_tbl, -1, 2 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_hold_wait_h1 = { cKF_ckcb_r_ply_1_hold_wait_h1_tbl, NULL, NULL, + cKF_c_ply_1_hold_wait_h1_tbl, -1, 2 }; u8 cKF_ckcb_r_ply_1_hold_wait_o1_tbl[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 @@ -2943,8 +3106,8 @@ s16 cKF_c_ply_1_hold_wait_o1_tbl[] = { 0, 1000, 200, 0, 0, 900, 50, -2 900, 900, -850, -900, 0, 0, -80, 0, 0, 0, 0, -120, 0, 0, -900, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_hold_wait_o1[] = { { cKF_ckcb_r_ply_1_hold_wait_o1_tbl, NULL, NULL, - cKF_c_ply_1_hold_wait_o1_tbl, -1, 2 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_hold_wait_o1 = { cKF_ckcb_r_ply_1_hold_wait_o1_tbl, NULL, NULL, + cKF_c_ply_1_hold_wait_o1_tbl, -1, 2 }; u8 cKF_ckcb_r_ply_1_get_t1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -2984,8 +3147,9 @@ s16 cKF_ds_ply_1_get_t1_tbl[] = { 22, 0, 0, 1, 0, 0, 22, 0, 0, 1, 0, 0, 22, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_get_t1[] = { { cKF_ckcb_r_ply_1_get_t1_tbl, cKF_ds_ply_1_get_t1_tbl, - cKF_kn_ply_1_get_t1_tbl, cKF_c_ply_1_get_t1_tbl, -1, 22 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_get_t1 = { + cKF_ckcb_r_ply_1_get_t1_tbl, cKF_ds_ply_1_get_t1_tbl, cKF_kn_ply_1_get_t1_tbl, cKF_c_ply_1_get_t1_tbl, -1, 22 +}; u8 ply_1_get_t11_tex_index[] = { 3, 0, 0, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 }; @@ -3042,8 +3206,9 @@ s16 cKF_ds_ply_1_get_t2_tbl[] = { 34, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_get_t2[] = { { cKF_ckcb_r_ply_1_get_t2_tbl, cKF_ds_ply_1_get_t2_tbl, - cKF_kn_ply_1_get_t2_tbl, cKF_c_ply_1_get_t2_tbl, -1, 34 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_get_t2 = { + cKF_ckcb_r_ply_1_get_t2_tbl, cKF_ds_ply_1_get_t2_tbl, cKF_kn_ply_1_get_t2_tbl, cKF_c_ply_1_get_t2_tbl, -1, 34 +}; u8 ply_1_get_t21_tex_index[] = { 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -3081,8 +3246,12 @@ s16 cKF_ds_ply_1_putaway_t1_tbl[] = { 16, 75, 0, 19, 100, 0, 1, 0, 0, 19, 0, 0, 1, 0, 0, 19, 0, 0, 1, 0, 0, 19, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_putaway_t1[] = { { cKF_ckcb_r_ply_1_putaway_t1_tbl, cKF_ds_ply_1_putaway_t1_tbl, - cKF_kn_ply_1_putaway_t1_tbl, cKF_c_ply_1_putaway_t1_tbl, -1, 19 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_putaway_t1 = { cKF_ckcb_r_ply_1_putaway_t1_tbl, + cKF_ds_ply_1_putaway_t1_tbl, + cKF_kn_ply_1_putaway_t1_tbl, + cKF_c_ply_1_putaway_t1_tbl, + -1, + 19 }; u8 cKF_ckcb_r_ply_1_sao1_tbl[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -3093,7 +3262,7 @@ s16 cKF_c_ply_1_sao1_tbl[] = { 0, 1000, 0, 0, 0, 900, 0, 0, 0, 900, -50, -850, 200, -100, -300, 100, 1100, 350, 80, 0, 0, 0, 0, -900, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_sao1[] = { { cKF_ckcb_r_ply_1_sao1_tbl, NULL, NULL, cKF_c_ply_1_sao1_tbl, -1, 2 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_sao1 = { cKF_ckcb_r_ply_1_sao1_tbl, NULL, NULL, cKF_c_ply_1_sao1_tbl, -1, 2 }; u8 cKF_ckcb_r_ply_1_sao_swing1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -3152,8 +3321,12 @@ s16 cKF_ds_ply_1_sao_swing1_tbl[] = { 1, 0, 0, 32, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_sao_swing1[] = { { cKF_ckcb_r_ply_1_sao_swing1_tbl, cKF_ds_ply_1_sao_swing1_tbl, - cKF_kn_ply_1_sao_swing1_tbl, cKF_c_ply_1_sao_swing1_tbl, -1, 32 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_sao_swing1 = { cKF_ckcb_r_ply_1_sao_swing1_tbl, + cKF_ds_ply_1_sao_swing1_tbl, + cKF_kn_ply_1_sao_swing1_tbl, + cKF_c_ply_1_sao_swing1_tbl, + -1, + 32 }; u8 cKF_ckcb_r_ply_1_turi_hiki1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -3192,8 +3365,12 @@ s16 cKF_ds_ply_1_turi_hiki1_tbl[] = { 10, -10, 0, 13, 30, 0, 1, 0, 0, 13, 0, 0, 1, 0, 0, 13, 0, 0, 1, 0, 0, 13, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_turi_hiki1[] = { { cKF_ckcb_r_ply_1_turi_hiki1_tbl, cKF_ds_ply_1_turi_hiki1_tbl, - cKF_kn_ply_1_turi_hiki1_tbl, cKF_c_ply_1_turi_hiki1_tbl, -1, 13 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_turi_hiki1 = { cKF_ckcb_r_ply_1_turi_hiki1_tbl, + cKF_ds_ply_1_turi_hiki1_tbl, + cKF_kn_ply_1_turi_hiki1_tbl, + cKF_c_ply_1_turi_hiki1_tbl, + -1, + 13 }; u8 cKF_ckcb_r_ply_1_turi_wait1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -3228,8 +3405,12 @@ s16 cKF_ds_ply_1_turi_wait1_tbl[] = { 33, 0, -52, 1, 0, 0, 33, 0, 0, 1, 0, 0, 33, 0, 0, 1, 0, 0, 33, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_turi_wait1[] = { { cKF_ckcb_r_ply_1_turi_wait1_tbl, cKF_ds_ply_1_turi_wait1_tbl, - cKF_kn_ply_1_turi_wait1_tbl, cKF_c_ply_1_turi_wait1_tbl, -1, 33 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_turi_wait1 = { cKF_ckcb_r_ply_1_turi_wait1_tbl, + cKF_ds_ply_1_turi_wait1_tbl, + cKF_kn_ply_1_turi_wait1_tbl, + cKF_c_ply_1_turi_wait1_tbl, + -1, + 33 }; u8 cKF_ckcb_r_ply_1_not_get_t1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -3275,8 +3456,12 @@ s16 cKF_ds_ply_1_not_get_t1_tbl[] = { 1, 0, 0, 27, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_not_get_t1[] = { { cKF_ckcb_r_ply_1_not_get_t1_tbl, cKF_ds_ply_1_not_get_t1_tbl, - cKF_kn_ply_1_not_get_t1_tbl, cKF_c_ply_1_not_get_t1_tbl, -1, 27 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_not_get_t1 = { cKF_ckcb_r_ply_1_not_get_t1_tbl, + cKF_ds_ply_1_not_get_t1_tbl, + cKF_kn_ply_1_not_get_t1_tbl, + cKF_c_ply_1_not_get_t1_tbl, + -1, + 27 }; u8 ply_1_not_get_t11_tex_index[] = { 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5 }; @@ -3312,9 +3497,12 @@ s16 cKF_ds_ply_1_menu_catch1_tbl[] = { 1, 0, 0, 5, 0, 0, 1, 0, 0, 5, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_menu_catch1[] = { { cKF_ckcb_r_ply_1_menu_catch1_tbl, cKF_ds_ply_1_menu_catch1_tbl, - cKF_kn_ply_1_menu_catch1_tbl, cKF_c_ply_1_menu_catch1_tbl, -1, - 5 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_menu_catch1 = { cKF_ckcb_r_ply_1_menu_catch1_tbl, + cKF_ds_ply_1_menu_catch1_tbl, + cKF_kn_ply_1_menu_catch1_tbl, + cKF_c_ply_1_menu_catch1_tbl, + -1, + 5 }; u8 cKF_ckcb_r_ply_1_menu_change1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -3384,9 +3572,12 @@ s16 cKF_ds_ply_1_menu_change1_tbl[] = { 93, 0, 0, 1, 0, 0, 93, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_menu_change1[] = { { cKF_ckcb_r_ply_1_menu_change1_tbl, cKF_ds_ply_1_menu_change1_tbl, - cKF_kn_ply_1_menu_change1_tbl, cKF_c_ply_1_menu_change1_tbl, -1, - 93 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_menu_change1 = { cKF_ckcb_r_ply_1_menu_change1_tbl, + cKF_ds_ply_1_menu_change1_tbl, + cKF_kn_ply_1_menu_change1_tbl, + cKF_c_ply_1_menu_change1_tbl, + -1, + 93 }; u8 ply_1_menu_change11_tex_index[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -3460,8 +3651,12 @@ s16 cKF_ds_ply_1_umb_close1_tbl[] = { 1, 0, 0, 30, 0, 0, 1, 0, 0, 30, 0, 0, 1, 0, 0, 30, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_umb_close1[] = { { cKF_ckcb_r_ply_1_umb_close1_tbl, cKF_ds_ply_1_umb_close1_tbl, - cKF_kn_ply_1_umb_close1_tbl, cKF_c_ply_1_umb_close1_tbl, -1, 30 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_umb_close1 = { cKF_ckcb_r_ply_1_umb_close1_tbl, + cKF_ds_ply_1_umb_close1_tbl, + cKF_kn_ply_1_umb_close1_tbl, + cKF_c_ply_1_umb_close1_tbl, + -1, + 30 }; u8 cKF_ckcb_r_ply_1_not_sao_swing1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 0, 0, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 0, 0, 0 }; @@ -3503,10 +3698,12 @@ s16 cKF_ds_ply_1_not_sao_swing1_tbl[] = { 1, 0, -983, 7, -100, 225, 11, -40, 406, 15, -30, 0, 25, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_not_sao_swing1[] = { - { cKF_ckcb_r_ply_1_not_sao_swing1_tbl, cKF_ds_ply_1_not_sao_swing1_tbl, cKF_kn_ply_1_not_sao_swing1_tbl, - cKF_c_ply_1_not_sao_swing1_tbl, -1, 25 } -}; +cKF_Animation_R_c cKF_ba_r_ply_1_not_sao_swing1 = { cKF_ckcb_r_ply_1_not_sao_swing1_tbl, + cKF_ds_ply_1_not_sao_swing1_tbl, + cKF_kn_ply_1_not_sao_swing1_tbl, + cKF_c_ply_1_not_sao_swing1_tbl, + -1, + 25 }; u8 ply_1_not_sao_swing11_tex_index[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 }; @@ -3543,9 +3740,12 @@ s16 cKF_ds_ply_1_intrain_wait1_tbl[] = { 31, 0, 0, 1, 0, 0, 31, 0, 0, 1, 0, 0, 31, 0, 0, 1, 0, 0, 31, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_intrain_wait1[] = { { cKF_ckcb_r_ply_1_intrain_wait1_tbl, - cKF_ds_ply_1_intrain_wait1_tbl, cKF_kn_ply_1_intrain_wait1_tbl, - cKF_c_ply_1_intrain_wait1_tbl, -1, 31 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_intrain_wait1 = { cKF_ckcb_r_ply_1_intrain_wait1_tbl, + cKF_ds_ply_1_intrain_wait1_tbl, + cKF_kn_ply_1_intrain_wait1_tbl, + cKF_c_ply_1_intrain_wait1_tbl, + -1, + 31 }; u8 cKF_ckcb_r_ply_1_clear_table1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -3620,9 +3820,12 @@ s16 cKF_ds_ply_1_clear_table1_tbl[] = { 41, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_clear_table1[] = { { cKF_ckcb_r_ply_1_clear_table1_tbl, cKF_ds_ply_1_clear_table1_tbl, - cKF_kn_ply_1_clear_table1_tbl, cKF_c_ply_1_clear_table1_tbl, -1, - 41 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_clear_table1 = { cKF_ckcb_r_ply_1_clear_table1_tbl, + cKF_ds_ply_1_clear_table1_tbl, + cKF_kn_ply_1_clear_table1_tbl, + cKF_c_ply_1_clear_table1_tbl, + -1, + 41 }; u8 cKF_ckcb_r_ply_1_dig1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -3700,8 +3903,9 @@ s16 cKF_ds_ply_1_dig1_tbl[] = { 1, 0, 0, 41, 0, 0, 1, 0, 0, 41, 0, 0, 1, 0, 0, 41, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_dig1[] = { { cKF_ckcb_r_ply_1_dig1_tbl, cKF_ds_ply_1_dig1_tbl, cKF_kn_ply_1_dig1_tbl, - cKF_c_ply_1_dig1_tbl, -1, 41 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_dig1 = { + cKF_ckcb_r_ply_1_dig1_tbl, cKF_ds_ply_1_dig1_tbl, cKF_kn_ply_1_dig1_tbl, cKF_c_ply_1_dig1_tbl, -1, 41 +}; u8 cKF_ckcb_r_ply_1_fill_up1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -3798,8 +4002,12 @@ s16 cKF_ds_ply_1_fill_up1_tbl[] = { 1, 0, 0, 51, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_fill_up1[] = { { cKF_ckcb_r_ply_1_fill_up1_tbl, cKF_ds_ply_1_fill_up1_tbl, - cKF_kn_ply_1_fill_up1_tbl, cKF_c_ply_1_fill_up1_tbl, -1, 51 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_fill_up1 = { cKF_ckcb_r_ply_1_fill_up1_tbl, + cKF_ds_ply_1_fill_up1_tbl, + cKF_kn_ply_1_fill_up1_tbl, + cKF_c_ply_1_fill_up1_tbl, + -1, + 51 }; u8 cKF_ckcb_r_ply_1_not_dig1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -3872,8 +4080,12 @@ s16 cKF_ds_ply_1_not_dig1_tbl[] = { 15, 0, 0, 35, 0, 0, 1, 0, 0, 15, 0, 0, 35, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_not_dig1[] = { { cKF_ckcb_r_ply_1_not_dig1_tbl, cKF_ds_ply_1_not_dig1_tbl, - cKF_kn_ply_1_not_dig1_tbl, cKF_c_ply_1_not_dig1_tbl, -1, 35 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_not_dig1 = { cKF_ckcb_r_ply_1_not_dig1_tbl, + cKF_ds_ply_1_not_dig1_tbl, + cKF_kn_ply_1_not_dig1_tbl, + cKF_c_ply_1_not_dig1_tbl, + -1, + 35 }; u8 ply_1_not_dig11_tex_index[] = { 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 3, 0, 0, 0, 0, 0 }; @@ -3954,10 +4166,12 @@ s16 cKF_ds_ply_1_clear_table_l1_tbl[] = { 41, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_clear_table_l1[] = { - { cKF_ckcb_r_ply_1_clear_table_l1_tbl, cKF_ds_ply_1_clear_table_l1_tbl, cKF_kn_ply_1_clear_table_l1_tbl, - cKF_c_ply_1_clear_table_l1_tbl, -1, 41 } -}; +cKF_Animation_R_c cKF_ba_r_ply_1_clear_table_l1 = { cKF_ckcb_r_ply_1_clear_table_l1_tbl, + cKF_ds_ply_1_clear_table_l1_tbl, + cKF_kn_ply_1_clear_table_l1_tbl, + cKF_c_ply_1_clear_table_l1_tbl, + -1, + 41 }; u8 cKF_ckcb_r_ply_1_pickup_l1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -4006,8 +4220,12 @@ s16 cKF_ds_ply_1_pickup_l1_tbl[] = { 1, 0, 0, 37, 0, 0, 1, 0, 0, 37, 0, 0, 1, 0, 0, 37, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_pickup_l1[] = { { cKF_ckcb_r_ply_1_pickup_l1_tbl, cKF_ds_ply_1_pickup_l1_tbl, - cKF_kn_ply_1_pickup_l1_tbl, cKF_c_ply_1_pickup_l1_tbl, -1, 37 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_pickup_l1 = { cKF_ckcb_r_ply_1_pickup_l1_tbl, + cKF_ds_ply_1_pickup_l1_tbl, + cKF_kn_ply_1_pickup_l1_tbl, + cKF_c_ply_1_pickup_l1_tbl, + -1, + 37 }; u8 cKF_ckcb_r_ply_1_scoop1_tbl[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -4018,8 +4236,7 @@ s16 cKF_c_ply_1_scoop1_tbl[] = { 0, 1000, 0, 0, 0, 900, 0, 0, 0, 900, -300, -400, 710, 0, -800, 0, 1024, 0, -125, 0, 0, 0, 0, -900, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_scoop1[] = { { cKF_ckcb_r_ply_1_scoop1_tbl, NULL, NULL, cKF_c_ply_1_scoop1_tbl, -1, - 2 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_scoop1 = { cKF_ckcb_r_ply_1_scoop1_tbl, NULL, NULL, cKF_c_ply_1_scoop1_tbl, -1, 2 }; u8 cKF_ckcb_r_ply_1_confirm1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -4078,8 +4295,12 @@ s16 cKF_ds_ply_1_confirm1_tbl[] = { 1, 0, 0, 31, 0, 0, 1, 0, 0, 31, 0, 0, 1, 0, 0, 31, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_confirm1[] = { { cKF_ckcb_r_ply_1_confirm1_tbl, cKF_ds_ply_1_confirm1_tbl, - cKF_kn_ply_1_confirm1_tbl, cKF_c_ply_1_confirm1_tbl, -1, 31 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_confirm1 = { cKF_ckcb_r_ply_1_confirm1_tbl, + cKF_ds_ply_1_confirm1_tbl, + cKF_kn_ply_1_confirm1_tbl, + cKF_c_ply_1_confirm1_tbl, + -1, + 31 }; u8 cKF_ckcb_r_ply_1_dig_suka1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -4151,8 +4372,12 @@ s16 cKF_ds_ply_1_dig_suka1_tbl[] = { 1, 0, 0, 41, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_dig_suka1[] = { { cKF_ckcb_r_ply_1_dig_suka1_tbl, cKF_ds_ply_1_dig_suka1_tbl, - cKF_kn_ply_1_dig_suka1_tbl, cKF_c_ply_1_dig_suka1_tbl, -1, 41 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_dig_suka1 = { cKF_ckcb_r_ply_1_dig_suka1_tbl, + cKF_ds_ply_1_dig_suka1_tbl, + cKF_kn_ply_1_dig_suka1_tbl, + cKF_c_ply_1_dig_suka1_tbl, + -1, + 41 }; u8 ply_1_dig_suka11_tex_index[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 3, 3, 3, 3, 3, 0 }; @@ -4271,8 +4496,9 @@ s16 cKF_ds_ply_1_get_d1_tbl[] = { 1, 0, 0, 66, 0, 0, 1, 0, 0, 66, 0, 0, 1, 0, 0, 66, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_get_d1[] = { { cKF_ckcb_r_ply_1_get_d1_tbl, cKF_ds_ply_1_get_d1_tbl, - cKF_kn_ply_1_get_d1_tbl, cKF_c_ply_1_get_d1_tbl, -1, 66 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_get_d1 = { + cKF_ckcb_r_ply_1_get_d1_tbl, cKF_ds_ply_1_get_d1_tbl, cKF_kn_ply_1_get_d1_tbl, cKF_c_ply_1_get_d1_tbl, -1, 66 +}; u8 cKF_ckcb_r_ply_1_putaway_d1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -4307,8 +4533,12 @@ s16 cKF_ds_ply_1_putaway_d1_tbl[] = { 16, 75, 0, 19, 100, 0, 1, 0, 0, 19, 0, 0, 1, 0, 0, 19, 0, 0, 1, 0, 0, 19, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_putaway_d1[] = { { cKF_ckcb_r_ply_1_putaway_d1_tbl, cKF_ds_ply_1_putaway_d1_tbl, - cKF_kn_ply_1_putaway_d1_tbl, cKF_c_ply_1_putaway_d1_tbl, -1, 19 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_putaway_d1 = { cKF_ckcb_r_ply_1_putaway_d1_tbl, + cKF_ds_ply_1_putaway_d1_tbl, + cKF_kn_ply_1_putaway_d1_tbl, + cKF_c_ply_1_putaway_d1_tbl, + -1, + 19 }; u8 cKF_ckcb_r_ply_1_dig_kabu1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -4410,8 +4640,12 @@ s16 cKF_ds_ply_1_dig_kabu1_tbl[] = { 1, 0, 0, 59, 0, 0, 1, 0, 0, 59, 0, 0, 1, 0, 0, 59, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_dig_kabu1[] = { { cKF_ckcb_r_ply_1_dig_kabu1_tbl, cKF_ds_ply_1_dig_kabu1_tbl, - cKF_kn_ply_1_dig_kabu1_tbl, cKF_c_ply_1_dig_kabu1_tbl, -1, 59 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_dig_kabu1 = { cKF_ckcb_r_ply_1_dig_kabu1_tbl, + cKF_ds_ply_1_dig_kabu1_tbl, + cKF_kn_ply_1_dig_kabu1_tbl, + cKF_c_ply_1_dig_kabu1_tbl, + -1, + 59 }; u8 cKF_ckcb_r_ply_1_fill_up_i1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -4528,8 +4762,12 @@ s16 cKF_ds_ply_1_fill_up_i1_tbl[] = { 8, 0, 0, 58, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_fill_up_i1[] = { { cKF_ckcb_r_ply_1_fill_up_i1_tbl, cKF_ds_ply_1_fill_up_i1_tbl, - cKF_kn_ply_1_fill_up_i1_tbl, cKF_c_ply_1_fill_up_i1_tbl, -1, 58 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_fill_up_i1 = { cKF_ckcb_r_ply_1_fill_up_i1_tbl, + cKF_ds_ply_1_fill_up_i1_tbl, + cKF_kn_ply_1_fill_up_i1_tbl, + cKF_c_ply_1_fill_up_i1_tbl, + -1, + 58 }; u8 cKF_ckcb_r_ply_1_send_mail1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -4587,8 +4825,12 @@ s16 cKF_ds_ply_1_send_mail1_tbl[] = { 1, 0, 0, 38, 0, 0, 1, 0, 0, 38, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_send_mail1[] = { { cKF_ckcb_r_ply_1_send_mail1_tbl, cKF_ds_ply_1_send_mail1_tbl, - cKF_kn_ply_1_send_mail1_tbl, cKF_c_ply_1_send_mail1_tbl, -1, 38 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_send_mail1 = { cKF_ckcb_r_ply_1_send_mail1_tbl, + cKF_ds_ply_1_send_mail1_tbl, + cKF_kn_ply_1_send_mail1_tbl, + cKF_c_ply_1_send_mail1_tbl, + -1, + 38 }; u8 cKF_ckcb_r_ply_1_get_f1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -4615,8 +4857,9 @@ s16 cKF_ds_ply_1_get_f1_tbl[] = { 1, 0, 0, 11, 0, -273, 1, 0, 0, 11, 0, 0, 1, 0, 0, 11, 0, 0, 1, 0, 0, 11, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_get_f1[] = { { cKF_ckcb_r_ply_1_get_f1_tbl, cKF_ds_ply_1_get_f1_tbl, - cKF_kn_ply_1_get_f1_tbl, cKF_c_ply_1_get_f1_tbl, -1, 11 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_get_f1 = { + cKF_ckcb_r_ply_1_get_f1_tbl, cKF_ds_ply_1_get_f1_tbl, cKF_kn_ply_1_get_f1_tbl, cKF_c_ply_1_get_f1_tbl, -1, 11 +}; u8 cKF_ckcb_r_ply_1_get_pull_f1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -4648,9 +4891,12 @@ s16 cKF_ds_ply_1_get_pull_f1_tbl[] = { 11, 0, 0, 1, 0, 0, 11, 0, 0, 1, 0, 0, 11, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_get_pull_f1[] = { { cKF_ckcb_r_ply_1_get_pull_f1_tbl, cKF_ds_ply_1_get_pull_f1_tbl, - cKF_kn_ply_1_get_pull_f1_tbl, cKF_c_ply_1_get_pull_f1_tbl, -1, - 11 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_get_pull_f1 = { cKF_ckcb_r_ply_1_get_pull_f1_tbl, + cKF_ds_ply_1_get_pull_f1_tbl, + cKF_kn_ply_1_get_pull_f1_tbl, + cKF_c_ply_1_get_pull_f1_tbl, + -1, + 11 }; u8 cKF_ckcb_r_ply_1_get_putaway_f1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -4692,10 +4938,12 @@ s16 cKF_ds_ply_1_get_putaway_f1_tbl[] = { 1, 0, 0, 31, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_get_putaway_f1[] = { - { cKF_ckcb_r_ply_1_get_putaway_f1_tbl, cKF_ds_ply_1_get_putaway_f1_tbl, cKF_kn_ply_1_get_putaway_f1_tbl, - cKF_c_ply_1_get_putaway_f1_tbl, -1, 31 } -}; +cKF_Animation_R_c cKF_ba_r_ply_1_get_putaway_f1 = { cKF_ckcb_r_ply_1_get_putaway_f1_tbl, + cKF_ds_ply_1_get_putaway_f1_tbl, + cKF_kn_ply_1_get_putaway_f1_tbl, + cKF_c_ply_1_get_putaway_f1_tbl, + -1, + 31 }; u8 cKF_ckcb_r_ply_1_trans_wait_f1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -4726,9 +4974,12 @@ s16 cKF_ds_ply_1_trans_wait_f1_tbl[] = { 17, 0, -150, 1, 0, 0, 17, 0, 0, 1, 0, 0, 17, 0, 0, 1, 0, 0, 17, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_trans_wait_f1[] = { { cKF_ckcb_r_ply_1_trans_wait_f1_tbl, - cKF_ds_ply_1_trans_wait_f1_tbl, cKF_kn_ply_1_trans_wait_f1_tbl, - cKF_c_ply_1_trans_wait_f1_tbl, -1, 17 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_trans_wait_f1 = { cKF_ckcb_r_ply_1_trans_wait_f1_tbl, + cKF_ds_ply_1_trans_wait_f1_tbl, + cKF_kn_ply_1_trans_wait_f1_tbl, + cKF_c_ply_1_trans_wait_f1_tbl, + -1, + 17 }; u8 cKF_ckcb_r_ply_1_transfer_f1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -4792,9 +5043,12 @@ s16 cKF_ds_ply_1_transfer_f1_tbl[] = { 39, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_transfer_f1[] = { { cKF_ckcb_r_ply_1_transfer_f1_tbl, cKF_ds_ply_1_transfer_f1_tbl, - cKF_kn_ply_1_transfer_f1_tbl, cKF_c_ply_1_transfer_f1_tbl, -1, - 39 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_transfer_f1 = { cKF_ckcb_r_ply_1_transfer_f1_tbl, + cKF_ds_ply_1_transfer_f1_tbl, + cKF_kn_ply_1_transfer_f1_tbl, + cKF_c_ply_1_transfer_f1_tbl, + -1, + 39 }; u8 cKF_ckcb_r_ply_1_shake1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -4864,8 +5118,9 @@ s16 cKF_ds_ply_1_shake1_tbl[] = { 39, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_shake1[] = { { cKF_ckcb_r_ply_1_shake1_tbl, cKF_ds_ply_1_shake1_tbl, - cKF_kn_ply_1_shake1_tbl, cKF_c_ply_1_shake1_tbl, -1, 39 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_shake1 = { + cKF_ckcb_r_ply_1_shake1_tbl, cKF_ds_ply_1_shake1_tbl, cKF_kn_ply_1_shake1_tbl, cKF_c_ply_1_shake1_tbl, -1, 39 +}; u8 ply_1_shake12_tex_index[] = { 0, 0, 0, 1, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 2, 2, 0, 0, 0, 0, 0 }; @@ -4904,8 +5159,9 @@ s16 cKF_ds_ply_1_tired1_tbl[] = { 21, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_tired1[] = { { cKF_ckcb_r_ply_1_tired1_tbl, cKF_ds_ply_1_tired1_tbl, - cKF_kn_ply_1_tired1_tbl, cKF_c_ply_1_tired1_tbl, -1, 21 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_tired1 = { + cKF_ckcb_r_ply_1_tired1_tbl, cKF_ds_ply_1_tired1_tbl, cKF_kn_ply_1_tired1_tbl, cKF_c_ply_1_tired1_tbl, -1, 21 +}; u8 cKF_ckcb_r_ply_1_wash1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -4951,8 +5207,9 @@ s16 cKF_ds_ply_1_wash1_tbl[] = { 17, 0, 0, 1, 0, 0, 17, 0, 0, 1, 0, 0, 17, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_wash1[] = { { cKF_ckcb_r_ply_1_wash1_tbl, cKF_ds_ply_1_wash1_tbl, - cKF_kn_ply_1_wash1_tbl, cKF_c_ply_1_wash1_tbl, -1, 17 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_wash1 = { + cKF_ckcb_r_ply_1_wash1_tbl, cKF_ds_ply_1_wash1_tbl, cKF_kn_ply_1_wash1_tbl, cKF_c_ply_1_wash1_tbl, -1, 17 +}; u8 cKF_ckcb_r_ply_1_wash2_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -4996,8 +5253,9 @@ s16 cKF_ds_ply_1_wash2_tbl[] = { 1, 0, 0, 17, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_wash2[] = { { cKF_ckcb_r_ply_1_wash2_tbl, cKF_ds_ply_1_wash2_tbl, - cKF_kn_ply_1_wash2_tbl, cKF_c_ply_1_wash2_tbl, -1, 17 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_wash2 = { + cKF_ckcb_r_ply_1_wash2_tbl, cKF_ds_ply_1_wash2_tbl, cKF_kn_ply_1_wash2_tbl, cKF_c_ply_1_wash2_tbl, -1, 17 +}; u8 cKF_ckcb_r_ply_1_wash3_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -5037,8 +5295,9 @@ s16 cKF_ds_ply_1_wash3_tbl[] = { 1, 0, 0, 17, 0, 0, 1, 0, 0, 17, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_wash3[] = { { cKF_ckcb_r_ply_1_wash3_tbl, cKF_ds_ply_1_wash3_tbl, - cKF_kn_ply_1_wash3_tbl, cKF_c_ply_1_wash3_tbl, -1, 17 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_wash3 = { + cKF_ckcb_r_ply_1_wash3_tbl, cKF_ds_ply_1_wash3_tbl, cKF_kn_ply_1_wash3_tbl, cKF_c_ply_1_wash3_tbl, -1, 17 +}; u8 cKF_ckcb_r_ply_1_wash4_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -5072,8 +5331,9 @@ s16 cKF_ds_ply_1_wash4_tbl[] = { 17, 0, 0, 1, 0, 0, 17, 0, 0, 1, 0, 0, 17, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_wash4[] = { { cKF_ckcb_r_ply_1_wash4_tbl, cKF_ds_ply_1_wash4_tbl, - cKF_kn_ply_1_wash4_tbl, cKF_c_ply_1_wash4_tbl, -1, 17 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_wash4 = { + cKF_ckcb_r_ply_1_wash4_tbl, cKF_ds_ply_1_wash4_tbl, cKF_kn_ply_1_wash4_tbl, cKF_c_ply_1_wash4_tbl, -1, 17 +}; u8 cKF_ckcb_r_ply_1_wash5_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -5108,8 +5368,9 @@ s16 cKF_ds_ply_1_wash5_tbl[] = { 1, 0, 0, 17, 0, 0, 1, 0, 0, 17, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_wash5[] = { { cKF_ckcb_r_ply_1_wash5_tbl, cKF_ds_ply_1_wash5_tbl, - cKF_kn_ply_1_wash5_tbl, cKF_c_ply_1_wash5_tbl, -1, 17 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_wash5 = { + cKF_ckcb_r_ply_1_wash5_tbl, cKF_ds_ply_1_wash5_tbl, cKF_kn_ply_1_wash5_tbl, cKF_c_ply_1_wash5_tbl, -1, 17 +}; u8 cKF_ckcb_r_ply_1_fukubiki1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -5169,8 +5430,12 @@ s16 cKF_ds_ply_1_fukubiki1_tbl[] = { 56, 0, 0, 1, 0, 0, 56, 0, 0, 1, 0, 0, 56, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_fukubiki1[] = { { cKF_ckcb_r_ply_1_fukubiki1_tbl, cKF_ds_ply_1_fukubiki1_tbl, - cKF_kn_ply_1_fukubiki1_tbl, cKF_c_ply_1_fukubiki1_tbl, -1, 56 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_fukubiki1 = { cKF_ckcb_r_ply_1_fukubiki1_tbl, + cKF_ds_ply_1_fukubiki1_tbl, + cKF_kn_ply_1_fukubiki1_tbl, + cKF_c_ply_1_fukubiki1_tbl, + -1, + 56 }; u8 cKF_ckcb_r_ply_1_omairi1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -5249,8 +5514,9 @@ s16 cKF_ds_ply_1_omairi1_tbl[] = { 1, 0, 0, 91, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_omairi1[] = { { cKF_ckcb_r_ply_1_omairi1_tbl, cKF_ds_ply_1_omairi1_tbl, - cKF_kn_ply_1_omairi1_tbl, cKF_c_ply_1_omairi1_tbl, -1, 91 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_omairi1 = { + cKF_ckcb_r_ply_1_omairi1_tbl, cKF_ds_ply_1_omairi1_tbl, cKF_kn_ply_1_omairi1_tbl, cKF_c_ply_1_omairi1_tbl, -1, 91 +}; u8 cKF_ckcb_r_ply_1_saisen1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -5310,8 +5576,9 @@ s16 cKF_ds_ply_1_saisen1_tbl[] = { 1, 0, 0, 43, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_saisen1[] = { { cKF_ckcb_r_ply_1_saisen1_tbl, cKF_ds_ply_1_saisen1_tbl, - cKF_kn_ply_1_saisen1_tbl, cKF_c_ply_1_saisen1_tbl, -1, 43 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_saisen1 = { + cKF_ckcb_r_ply_1_saisen1_tbl, cKF_ds_ply_1_saisen1_tbl, cKF_kn_ply_1_saisen1_tbl, cKF_c_ply_1_saisen1_tbl, -1, 43 +}; u8 cKF_ckcb_r_ply_1_return_mail1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -5346,9 +5613,12 @@ s16 cKF_ds_ply_1_return_mail1_tbl[] = { 12, 0, 0, 1, 0, 0, 12, 0, 0, 1, 0, 0, 12, 0, 0, 1, 0, 0, 12, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_return_mail1[] = { { cKF_ckcb_r_ply_1_return_mail1_tbl, cKF_ds_ply_1_return_mail1_tbl, - cKF_kn_ply_1_return_mail1_tbl, cKF_c_ply_1_return_mail1_tbl, -1, - 12 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_return_mail1 = { cKF_ckcb_r_ply_1_return_mail1_tbl, + cKF_ds_ply_1_return_mail1_tbl, + cKF_kn_ply_1_return_mail1_tbl, + cKF_c_ply_1_return_mail1_tbl, + -1, + 12 }; u8 cKF_ckcb_r_ply_1_return_mail2_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -5392,9 +5662,12 @@ s16 cKF_ds_ply_1_return_mail2_tbl[] = { 1, 0, 0, 19, 0, 0, 1, 0, 0, 19, 0, 0, 1, 0, 0, 19, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_return_mail2[] = { { cKF_ckcb_r_ply_1_return_mail2_tbl, cKF_ds_ply_1_return_mail2_tbl, - cKF_kn_ply_1_return_mail2_tbl, cKF_c_ply_1_return_mail2_tbl, -1, - 19 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_return_mail2 = { cKF_ckcb_r_ply_1_return_mail2_tbl, + cKF_ds_ply_1_return_mail2_tbl, + cKF_kn_ply_1_return_mail2_tbl, + cKF_c_ply_1_return_mail2_tbl, + -1, + 19 }; u8 cKF_ckcb_r_ply_1_return_mail3_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -5437,9 +5710,12 @@ s16 cKF_ds_ply_1_return_mail3_tbl[] = { 1, 0, 0, 20, 0, 0, 1, 0, 0, 20, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_return_mail3[] = { { cKF_ckcb_r_ply_1_return_mail3_tbl, cKF_ds_ply_1_return_mail3_tbl, - cKF_kn_ply_1_return_mail3_tbl, cKF_c_ply_1_return_mail3_tbl, -1, - 20 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_return_mail3 = { cKF_ckcb_r_ply_1_return_mail3_tbl, + cKF_ds_ply_1_return_mail3_tbl, + cKF_kn_ply_1_return_mail3_tbl, + cKF_c_ply_1_return_mail3_tbl, + -1, + 20 }; u8 cKF_ckcb_r_ply_1_eat1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 0, 0, 0 }; @@ -5502,8 +5778,9 @@ s16 cKF_ds_ply_1_eat1_tbl[] = { 82, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_eat1[] = { { cKF_ckcb_r_ply_1_eat1_tbl, cKF_ds_ply_1_eat1_tbl, cKF_kn_ply_1_eat1_tbl, - cKF_c_ply_1_eat1_tbl, -1, 82 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_eat1 = { + cKF_ckcb_r_ply_1_eat1_tbl, cKF_ds_ply_1_eat1_tbl, cKF_kn_ply_1_eat1_tbl, cKF_c_ply_1_eat1_tbl, -1, 82 +}; u8 ply_1_eat11_tex_index[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 1, 0, 0, 0, 0, 0, 2, 2, 2, 1, 0, 0, 0, 0, 2, 2, 2, 1, 0, 0, 0, 0, 0, 2, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -5543,8 +5820,9 @@ s16 cKF_ds_ply_1_gaaan1_tbl[] = { 5, 198, 0, 6, 178, 0, 7, 188, 335, 11, 190, -202, 1, 0, 0, 11, 0, 152 }; -cKF_Animation_R_c cKF_ba_r_ply_1_gaaan1[] = { { cKF_ckcb_r_ply_1_gaaan1_tbl, cKF_ds_ply_1_gaaan1_tbl, - cKF_kn_ply_1_gaaan1_tbl, cKF_c_ply_1_gaaan1_tbl, -1, 11 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_gaaan1 = { + cKF_ckcb_r_ply_1_gaaan1_tbl, cKF_ds_ply_1_gaaan1_tbl, cKF_kn_ply_1_gaaan1_tbl, cKF_c_ply_1_gaaan1_tbl, -1, 11 +}; u8 ply_1_gaaan11_tex_index[] = { 3, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5 }; @@ -5578,8 +5856,9 @@ s16 cKF_ds_ply_1_gaaan2_tbl[] = { 8, 170, 0, 24, 215, 0, 31, 190, -202, 1, 0, 152, 8, 20, 0, 24, -20, 0, 31, 0, 152 }; -cKF_Animation_R_c cKF_ba_r_ply_1_gaaan2[] = { { cKF_ckcb_r_ply_1_gaaan2_tbl, cKF_ds_ply_1_gaaan2_tbl, - cKF_kn_ply_1_gaaan2_tbl, cKF_c_ply_1_gaaan2_tbl, -1, 31 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_gaaan2 = { + cKF_ckcb_r_ply_1_gaaan2_tbl, cKF_ds_ply_1_gaaan2_tbl, cKF_kn_ply_1_gaaan2_tbl, cKF_c_ply_1_gaaan2_tbl, -1, 31 +}; u8 cKF_ckcb_r_ply_1_deru1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -5635,8 +5914,9 @@ s16 cKF_ds_ply_1_deru1_tbl[] = { 1, 0, 0, 57, 0, 0, 1, 0, 0, 57, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_deru1[] = { { cKF_ckcb_r_ply_1_deru1_tbl, cKF_ds_ply_1_deru1_tbl, - cKF_kn_ply_1_deru1_tbl, cKF_c_ply_1_deru1_tbl, -1, 57 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_deru1 = { + cKF_ckcb_r_ply_1_deru1_tbl, cKF_ds_ply_1_deru1_tbl, cKF_kn_ply_1_deru1_tbl, cKF_c_ply_1_deru1_tbl, -1, 57 +}; u8 ply_1_deru11_tex_index[] = { 5, 5, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3 }; @@ -5695,8 +5975,12 @@ s16 cKF_ds_ply_1_guratuku1_tbl[] = { 25, 0, 0, 1, 0, 0, 25, 0, 0, 1, 0, 0, 25, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_guratuku1[] = { { cKF_ckcb_r_ply_1_guratuku1_tbl, cKF_ds_ply_1_guratuku1_tbl, - cKF_kn_ply_1_guratuku1_tbl, cKF_c_ply_1_guratuku1_tbl, -1, 25 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_guratuku1 = { cKF_ckcb_r_ply_1_guratuku1_tbl, + cKF_ds_ply_1_guratuku1_tbl, + cKF_kn_ply_1_guratuku1_tbl, + cKF_c_ply_1_guratuku1_tbl, + -1, + 25 }; u8 ply_1_guratuku11_tex_index[] = { 0, 3, 4, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5 }; @@ -5760,8 +6044,9 @@ s16 cKF_ds_ply_1_mogaku1_tbl[] = { 41, 0, 0, 1, 0, 0, 41, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_mogaku1[] = { { cKF_ckcb_r_ply_1_mogaku1_tbl, cKF_ds_ply_1_mogaku1_tbl, - cKF_kn_ply_1_mogaku1_tbl, cKF_c_ply_1_mogaku1_tbl, -1, 41 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_mogaku1 = { + cKF_ckcb_r_ply_1_mogaku1_tbl, cKF_ds_ply_1_mogaku1_tbl, cKF_kn_ply_1_mogaku1_tbl, cKF_c_ply_1_mogaku1_tbl, -1, 41 +}; u8 ply_1_mogaku11_tex_index[] = { 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5 }; @@ -5798,8 +6083,9 @@ s16 cKF_ds_ply_1_otiru1_tbl[] = { 1, 0, 0, 9, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_otiru1[] = { { cKF_ckcb_r_ply_1_otiru1_tbl, cKF_ds_ply_1_otiru1_tbl, - cKF_kn_ply_1_otiru1_tbl, cKF_c_ply_1_otiru1_tbl, -1, 9 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_otiru1 = { + cKF_ckcb_r_ply_1_otiru1_tbl, cKF_ds_ply_1_otiru1_tbl, cKF_kn_ply_1_otiru1_tbl, cKF_c_ply_1_otiru1_tbl, -1, 9 +}; u8 ply_1_otiru11_tex_index[] = { 5, 5, 5, 5, 4, 4, 5, 5, 5 }; @@ -5854,8 +6140,9 @@ s16 cKF_ds_ply_1_zassou1_tbl[] = { 25, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_zassou1[] = { { cKF_ckcb_r_ply_1_zassou1_tbl, cKF_ds_ply_1_zassou1_tbl, - cKF_kn_ply_1_zassou1_tbl, cKF_c_ply_1_zassou1_tbl, -1, 25 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_zassou1 = { + cKF_ckcb_r_ply_1_zassou1_tbl, cKF_ds_ply_1_zassou1_tbl, cKF_kn_ply_1_zassou1_tbl, cKF_c_ply_1_zassou1_tbl, -1, 25 +}; u8 cKF_ckcb_r_ply_1_knock1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -5903,8 +6190,9 @@ s16 cKF_ds_ply_1_knock1_tbl[] = { 24, 0, 0, 1, 0, 0, 24, 0, 0, 1, 0, 0, 24, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_knock1[] = { { cKF_ckcb_r_ply_1_knock1_tbl, cKF_ds_ply_1_knock1_tbl, - cKF_kn_ply_1_knock1_tbl, cKF_c_ply_1_knock1_tbl, -1, 24 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_knock1 = { + cKF_ckcb_r_ply_1_knock1_tbl, cKF_ds_ply_1_knock1_tbl, cKF_kn_ply_1_knock1_tbl, cKF_c_ply_1_knock1_tbl, -1, 24 +}; u8 cKF_ckcb_r_ply_1_biku1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -5964,8 +6252,9 @@ s16 cKF_ds_ply_1_biku1_tbl[] = { 1, 0, 0, 25, 0, 0, 1, 0, 0, 25, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_biku1[] = { { cKF_ckcb_r_ply_1_biku1_tbl, cKF_ds_ply_1_biku1_tbl, - cKF_kn_ply_1_biku1_tbl, cKF_c_ply_1_biku1_tbl, -1, 25 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_biku1 = { + cKF_ckcb_r_ply_1_biku1_tbl, cKF_ds_ply_1_biku1_tbl, cKF_kn_ply_1_biku1_tbl, cKF_c_ply_1_biku1_tbl, -1, 25 +}; u8 ply_1_biku11_tex_index[] = { 3, 3, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 }; @@ -6081,8 +6370,9 @@ s16 cKF_ds_ply_1_hati1_tbl[] = { 65, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_hati1[] = { { cKF_ckcb_r_ply_1_hati1_tbl, cKF_ds_ply_1_hati1_tbl, - cKF_kn_ply_1_hati1_tbl, cKF_c_ply_1_hati1_tbl, -1, 65 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_hati1 = { + cKF_ckcb_r_ply_1_hati1_tbl, cKF_ds_ply_1_hati1_tbl, cKF_kn_ply_1_hati1_tbl, cKF_c_ply_1_hati1_tbl, -1, 65 +}; u8 ply_1_hati11_tex_index[] = { 0, 3, 4, 5, 5, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 4, @@ -6152,8 +6442,9 @@ s16 cKF_ds_ply_1_hati2_tbl[] = { 1, -1844, 0, 62, -487, 0, 1, 0, 0, 62, 0, 0, 1, 0, 0, 62, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_hati2[] = { { cKF_ckcb_r_ply_1_hati2_tbl, cKF_ds_ply_1_hati2_tbl, - cKF_kn_ply_1_hati2_tbl, cKF_c_ply_1_hati2_tbl, -1, 62 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_hati2 = { + cKF_ckcb_r_ply_1_hati2_tbl, cKF_ds_ply_1_hati2_tbl, cKF_kn_ply_1_hati2_tbl, cKF_c_ply_1_hati2_tbl, -1, 62 +}; u8 ply_1_hati21_tex_index[] = { 3, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 5, 5, 4, 4, 4, @@ -6228,8 +6519,9 @@ s16 cKF_ds_ply_1_hati3_tbl[] = { 1, -487, 0, 32, 0, 0, 1, 0, 0, 32, 0, 0, 1, 0, 0, 32, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_hati3[] = { { cKF_ckcb_r_ply_1_hati3_tbl, cKF_ds_ply_1_hati3_tbl, - cKF_kn_ply_1_hati3_tbl, cKF_c_ply_1_hati3_tbl, -1, 32 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_hati3 = { + cKF_ckcb_r_ply_1_hati3_tbl, cKF_ds_ply_1_hati3_tbl, cKF_kn_ply_1_hati3_tbl, cKF_c_ply_1_hati3_tbl, -1, 32 +}; u8 ply_1_hati31_tex_index[] = { 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 5, 5, 5, 5, 5, 5, 5, 5 }; @@ -6279,8 +6571,12 @@ s16 cKF_ds_ply_1_push_yuki1_tbl[] = { 17, 0, 0, 1, 0, 0, 17, 0, 0, 1, 0, 0, 17, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_push_yuki1[] = { { cKF_ckcb_r_ply_1_push_yuki1_tbl, cKF_ds_ply_1_push_yuki1_tbl, - cKF_kn_ply_1_push_yuki1_tbl, cKF_c_ply_1_push_yuki1_tbl, -1, 17 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_push_yuki1 = { cKF_ckcb_r_ply_1_push_yuki1_tbl, + cKF_ds_ply_1_push_yuki1_tbl, + cKF_kn_ply_1_push_yuki1_tbl, + cKF_c_ply_1_push_yuki1_tbl, + -1, + 17 }; u8 cKF_ckcb_r_ply_1_deru2_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -6342,8 +6638,9 @@ s16 cKF_ds_ply_1_deru2_tbl[] = { 1, 0, 0, 57, 0, 0, 1, 0, 0, 57, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_deru2[] = { { cKF_ckcb_r_ply_1_deru2_tbl, cKF_ds_ply_1_deru2_tbl, - cKF_kn_ply_1_deru2_tbl, cKF_c_ply_1_deru2_tbl, -1, 57 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_deru2 = { + cKF_ckcb_r_ply_1_deru2_tbl, cKF_ds_ply_1_deru2_tbl, cKF_kn_ply_1_deru2_tbl, cKF_c_ply_1_deru2_tbl, -1, 57 +}; u8 ply_1_deru21_tex_index[] = { 5, 5, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3 }; @@ -6383,8 +6680,9 @@ s16 cKF_ds_ply_1_otiru2_tbl[] = { 1, 0, 0, 9, 0, 0, 1, 0, 0, 9, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_otiru2[] = { { cKF_ckcb_r_ply_1_otiru2_tbl, cKF_ds_ply_1_otiru2_tbl, - cKF_kn_ply_1_otiru2_tbl, cKF_c_ply_1_otiru2_tbl, -1, 9 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_otiru2 = { + cKF_ckcb_r_ply_1_otiru2_tbl, cKF_ds_ply_1_otiru2_tbl, cKF_kn_ply_1_otiru2_tbl, cKF_c_ply_1_otiru2_tbl, -1, 9 +}; u8 ply_1_otiru21_tex_index[] = { 5, 5, 5, 5, 4, 4, 5, 5, 5 }; @@ -6467,8 +6765,12 @@ s16 cKF_ds_ply_1_itazura1_tbl[] = { 1, 0, 0, 49, 0, 0, 1, 0, 0, 49, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_itazura1[] = { { cKF_ckcb_r_ply_1_itazura1_tbl, cKF_ds_ply_1_itazura1_tbl, - cKF_kn_ply_1_itazura1_tbl, cKF_c_ply_1_itazura1_tbl, -1, 49 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_itazura1 = { cKF_ckcb_r_ply_1_itazura1_tbl, + cKF_ds_ply_1_itazura1_tbl, + cKF_kn_ply_1_itazura1_tbl, + cKF_c_ply_1_itazura1_tbl, + -1, + 49 }; u8 ply_1_itazura11_tex_index[] = { 0, 3, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 3, 3, 3, 3, 3, 3, 4, 5, 5, 5, 5, 5, 5, 4, 3, 3, 3, 3 }; @@ -6524,8 +6826,12 @@ s16 cKF_ds_ply_1_umb_rot1_tbl[] = { 1, 0, 0, 57, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_umb_rot1[] = { { cKF_ckcb_r_ply_1_umb_rot1_tbl, cKF_ds_ply_1_umb_rot1_tbl, - cKF_kn_ply_1_umb_rot1_tbl, cKF_c_ply_1_umb_rot1_tbl, -1, 57 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_umb_rot1 = { cKF_ckcb_r_ply_1_umb_rot1_tbl, + cKF_ds_ply_1_umb_rot1_tbl, + cKF_kn_ply_1_umb_rot1_tbl, + cKF_c_ply_1_umb_rot1_tbl, + -1, + 57 }; u8 cKF_ckcb_r_ply_1_pickup_wait1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -6575,9 +6881,12 @@ s16 cKF_ds_ply_1_pickup_wait1_tbl[] = { 25, 0, 0, 1, 0, 0, 25, 0, 0, 1, 0, 0, 25, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_pickup_wait1[] = { { cKF_ckcb_r_ply_1_pickup_wait1_tbl, cKF_ds_ply_1_pickup_wait1_tbl, - cKF_kn_ply_1_pickup_wait1_tbl, cKF_c_ply_1_pickup_wait1_tbl, -1, - 25 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_pickup_wait1 = { cKF_ckcb_r_ply_1_pickup_wait1_tbl, + cKF_ds_ply_1_pickup_wait1_tbl, + cKF_kn_ply_1_pickup_wait1_tbl, + cKF_c_ply_1_pickup_wait1_tbl, + -1, + 25 }; u8 cKF_ckcb_r_ply_1_yatta1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -6672,8 +6981,9 @@ s16 cKF_ds_ply_1_yatta1_tbl[] = { 1, 0, 0, 53, 0, 0, 1, 0, 0, 53, 0, 0, 1, 0, 0, 53, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_yatta1[] = { { cKF_ckcb_r_ply_1_yatta1_tbl, cKF_ds_ply_1_yatta1_tbl, - cKF_kn_ply_1_yatta1_tbl, cKF_c_ply_1_yatta1_tbl, -1, 53 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_yatta1 = { + cKF_ckcb_r_ply_1_yatta1_tbl, cKF_ds_ply_1_yatta1_tbl, cKF_kn_ply_1_yatta1_tbl, cKF_c_ply_1_yatta1_tbl, -1, 53 +}; u8 ply_1_yatta11_tex_index[] = { 0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, 2 }; @@ -6777,8 +7087,9 @@ s16 cKF_ds_ply_1_yatta2_tbl[] = { 53, 0, 0, 1, 0, 0, 53, 0, 0, 1, 0, 0, 53, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_yatta2[] = { { cKF_ckcb_r_ply_1_yatta2_tbl, cKF_ds_ply_1_yatta2_tbl, - cKF_kn_ply_1_yatta2_tbl, cKF_c_ply_1_yatta2_tbl, -1, 53 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_yatta2 = { + cKF_ckcb_r_ply_1_yatta2_tbl, cKF_ds_ply_1_yatta2_tbl, cKF_kn_ply_1_yatta2_tbl, cKF_c_ply_1_yatta2_tbl, -1, 53 +}; u8 ply_1_yatta21_tex_index[] = { 0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, 2 }; @@ -6878,8 +7189,9 @@ s16 cKF_ds_ply_1_yatta3_tbl[] = { 53, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_yatta3[] = { { cKF_ckcb_r_ply_1_yatta3_tbl, cKF_ds_ply_1_yatta3_tbl, - cKF_kn_ply_1_yatta3_tbl, cKF_c_ply_1_yatta3_tbl, -1, 53 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_yatta3 = { + cKF_ckcb_r_ply_1_yatta3_tbl, cKF_ds_ply_1_yatta3_tbl, cKF_kn_ply_1_yatta3_tbl, cKF_c_ply_1_yatta3_tbl, -1, 53 +}; u8 ply_1_yatta31_tex_index[] = { 0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, 2 }; @@ -6896,8 +7208,7 @@ s16 cKF_c_ply_1_kaza1_tbl[] = { 0, 1000, 0, 0, 0, 900, 0, 0, 0, 900, 450, -450, 150, 300, -150, 0, 50, 0, 300, 0, 0, 0, 0, -900, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_kaza1[] = { { cKF_ckcb_r_ply_1_kaza1_tbl, NULL, NULL, cKF_c_ply_1_kaza1_tbl, -1, - 29 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_kaza1 = { cKF_ckcb_r_ply_1_kaza1_tbl, NULL, NULL, cKF_c_ply_1_kaza1_tbl, -1, 29 }; u8 cKF_ckcb_r_ply_1_mosquito1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -6951,8 +7262,12 @@ s16 cKF_ds_ply_1_mosquito1_tbl[] = { 1, 0, 0, 31, 0, 0, 1, 0, 0, 31, 0, 0, 1, 0, 0, 31, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_mosquito1[] = { { cKF_ckcb_r_ply_1_mosquito1_tbl, cKF_ds_ply_1_mosquito1_tbl, - cKF_kn_ply_1_mosquito1_tbl, cKF_c_ply_1_mosquito1_tbl, -1, 31 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_mosquito1 = { cKF_ckcb_r_ply_1_mosquito1_tbl, + cKF_ds_ply_1_mosquito1_tbl, + cKF_kn_ply_1_mosquito1_tbl, + cKF_c_ply_1_mosquito1_tbl, + -1, + 31 }; u8 ply_1_mosquito11_tex_index[] = { 3, 3, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 }; @@ -6990,8 +7305,12 @@ s16 cKF_ds_ply_1_mosquito2_tbl[] = { 31, -14, 10 }; -cKF_Animation_R_c cKF_ba_r_ply_1_mosquito2[] = { { cKF_ckcb_r_ply_1_mosquito2_tbl, cKF_ds_ply_1_mosquito2_tbl, - cKF_kn_ply_1_mosquito2_tbl, cKF_c_ply_1_mosquito2_tbl, -1, 31 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_mosquito2 = { cKF_ckcb_r_ply_1_mosquito2_tbl, + cKF_ds_ply_1_mosquito2_tbl, + cKF_kn_ply_1_mosquito2_tbl, + cKF_c_ply_1_mosquito2_tbl, + -1, + 31 }; u8 cKF_ckcb_r_ply_1_ride1_tbl[] = { 31, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -7060,8 +7379,9 @@ s16 cKF_ds_ply_1_ride1_tbl[] = { 30, 0, 0, 1, 0, 0, 13, 0, 0, 28, 0, 0, 30, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_ride1[] = { { cKF_ckcb_r_ply_1_ride1_tbl, cKF_ds_ply_1_ride1_tbl, - cKF_kn_ply_1_ride1_tbl, cKF_c_ply_1_ride1_tbl, -1, 30 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_ride1 = { + cKF_ckcb_r_ply_1_ride1_tbl, cKF_ds_ply_1_ride1_tbl, cKF_kn_ply_1_ride1_tbl, cKF_c_ply_1_ride1_tbl, -1, 30 +}; u8 cKF_ckcb_r_ply_1_ride2_tbl[] = { 63, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -7129,8 +7449,9 @@ s16 cKF_ds_ply_1_ride2_tbl[] = { 12, 0, 0, 14, 0, 0, 36, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_ride2[] = { { cKF_ckcb_r_ply_1_ride2_tbl, cKF_ds_ply_1_ride2_tbl, - cKF_kn_ply_1_ride2_tbl, cKF_c_ply_1_ride2_tbl, -1, 36 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_ride2 = { + cKF_ckcb_r_ply_1_ride2_tbl, cKF_ds_ply_1_ride2_tbl, cKF_kn_ply_1_ride2_tbl, cKF_c_ply_1_ride2_tbl, -1, 36 +}; u8 cKF_ckcb_r_ply_1_ridewait_tbl[] = { 63, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -7166,8 +7487,12 @@ s16 cKF_ds_ply_1_ridewait_tbl[] = { 1, 0, 0, 61, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_ridewait[] = { { cKF_ckcb_r_ply_1_ridewait_tbl, cKF_ds_ply_1_ridewait_tbl, - cKF_kn_ply_1_ridewait_tbl, cKF_c_ply_1_ridewait_tbl, -1, 61 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_ridewait = { cKF_ckcb_r_ply_1_ridewait_tbl, + cKF_ds_ply_1_ridewait_tbl, + cKF_kn_ply_1_ridewait_tbl, + cKF_c_ply_1_ridewait_tbl, + -1, + 61 }; u8 cKF_ckcb_r_ply_1_getoff1_tbl[] = { 63, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -7257,8 +7582,9 @@ s16 cKF_ds_ply_1_getoff1_tbl[] = { 41, 0, 0, 1, 0, 0, 22, 0, 0, 27, 0, 0, 28, 0, 0, 41, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_getoff1[] = { { cKF_ckcb_r_ply_1_getoff1_tbl, cKF_ds_ply_1_getoff1_tbl, - cKF_kn_ply_1_getoff1_tbl, cKF_c_ply_1_getoff1_tbl, -1, 41 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_getoff1 = { + cKF_ckcb_r_ply_1_getoff1_tbl, cKF_ds_ply_1_getoff1_tbl, cKF_kn_ply_1_getoff1_tbl, cKF_c_ply_1_getoff1_tbl, -1, 41 +}; u8 cKF_ckcb_r_ply_1_getoff2_tbl[] = { 63, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -7329,8 +7655,9 @@ s16 cKF_ds_ply_1_getoff2_tbl[] = { 33, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_getoff2[] = { { cKF_ckcb_r_ply_1_getoff2_tbl, cKF_ds_ply_1_getoff2_tbl, - cKF_kn_ply_1_getoff2_tbl, cKF_c_ply_1_getoff2_tbl, -1, 33 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_getoff2 = { + cKF_ckcb_r_ply_1_getoff2_tbl, cKF_ds_ply_1_getoff2_tbl, cKF_kn_ply_1_getoff2_tbl, cKF_c_ply_1_getoff2_tbl, -1, 33 +}; u8 cKF_ckcb_r_ply_1_utiwa_wait1_tbl[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 0, 0, 0, 0, 0 @@ -7351,9 +7678,12 @@ s16 cKF_ds_ply_1_utiwa_wait1_tbl[] = { 1, -58, -97, 8, -100, 0, 16, -55, 10, 300, 0, 17, 630, 1063, 1, -495, -324, 2, -500, 0, 10, -400, 0, 17, -495, -324, 1, 348, 138, 2, 350, 0, 10, 300, 0, 17, 348, 138 }; -cKF_Animation_R_c cKF_ba_r_ply_1_utiwa_wait1[] = { { cKF_ckcb_r_ply_1_utiwa_wait1_tbl, cKF_ds_ply_1_utiwa_wait1_tbl, - cKF_kn_ply_1_utiwa_wait1_tbl, cKF_c_ply_1_utiwa_wait1_tbl, -1, - 17 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_utiwa_wait1 = { cKF_ckcb_r_ply_1_utiwa_wait1_tbl, + cKF_ds_ply_1_utiwa_wait1_tbl, + cKF_kn_ply_1_utiwa_wait1_tbl, + cKF_c_ply_1_utiwa_wait1_tbl, + -1, + 17 }; u8 cKF_ckcb_r_ply_1_utiwa_d1_tbl[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 0, 0, 0, 0 }; @@ -7375,8 +7705,9 @@ s16 cKF_ds_ply_1_utiwa_d1_tbl[] = { 1, 31, 0, 9, 31, 0, 1, 51, 0, 9, 51, 0, 1, -63, 0, 9, -63, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_utiwa_d1[] = { { cKF_ckcb_r_ply_1_utiwa_d1_tbl, cKF_ds_ply_1_utiwa_d1_tbl, - cKF_kn_ply_1_utiwa_d1_tbl, cKF_c_ply_1_utiwa_d1_tbl, -1, 9 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_utiwa_d1 = { + cKF_ckcb_r_ply_1_utiwa_d1_tbl, cKF_ds_ply_1_utiwa_d1_tbl, cKF_kn_ply_1_utiwa_d1_tbl, cKF_c_ply_1_utiwa_d1_tbl, -1, 9 +}; u8 cKF_ckcb_r_ply_1_axe_break1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -7462,8 +7793,12 @@ s16 cKF_ds_ply_1_axe_break1_tbl[] = { 1, 0, 0, 47, 0, 0, 61, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_axe_break1[] = { { cKF_ckcb_r_ply_1_axe_break1_tbl, cKF_ds_ply_1_axe_break1_tbl, - cKF_kn_ply_1_axe_break1_tbl, cKF_c_ply_1_axe_break1_tbl, -1, 61 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_axe_break1 = { cKF_ckcb_r_ply_1_axe_break1_tbl, + cKF_ds_ply_1_axe_break1_tbl, + cKF_kn_ply_1_axe_break1_tbl, + cKF_c_ply_1_axe_break1_tbl, + -1, + 61 }; u8 ply_1_axe_break11_tex_index[] = { 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, @@ -7517,10 +7852,12 @@ s16 cKF_ds_ply_1_axe_breakwait1_tbl[] = { 33, 0, 0, 1, 0, 0, 33, 0, 0, 1, 0, 0, 33, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_axe_breakwait1[] = { - { cKF_ckcb_r_ply_1_axe_breakwait1_tbl, cKF_ds_ply_1_axe_breakwait1_tbl, cKF_kn_ply_1_axe_breakwait1_tbl, - cKF_c_ply_1_axe_breakwait1_tbl, -1, 33 } -}; +cKF_Animation_R_c cKF_ba_r_ply_1_axe_breakwait1 = { cKF_ckcb_r_ply_1_axe_breakwait1_tbl, + cKF_ds_ply_1_axe_breakwait1_tbl, + cKF_kn_ply_1_axe_breakwait1_tbl, + cKF_c_ply_1_axe_breakwait1_tbl, + -1, + 33 }; u8 cKF_ckcb_r_ply_1_light_on1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -7584,8 +7921,12 @@ s16 cKF_ds_ply_1_light_on1_tbl[] = { 48, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_light_on1[] = { { cKF_ckcb_r_ply_1_light_on1_tbl, cKF_ds_ply_1_light_on1_tbl, - cKF_kn_ply_1_light_on1_tbl, cKF_c_ply_1_light_on1_tbl, -1, 48 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_light_on1 = { cKF_ckcb_r_ply_1_light_on1_tbl, + cKF_ds_ply_1_light_on1_tbl, + cKF_kn_ply_1_light_on1_tbl, + cKF_c_ply_1_light_on1_tbl, + -1, + 48 }; u8 cKF_ckcb_r_ply_1_taisou1_tbl[] = { 24, 2, 0, 7, 2, 3, 0, 7, 2, 3, 0, 2, 2, 2, 0, 7, 2, 0, 7, 2, 7, 2, 0, 7, 0, 0 }; @@ -7630,8 +7971,9 @@ s16 cKF_ds_ply_1_taisou1_tbl[] = { 81, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_taisou1[] = { { cKF_ckcb_r_ply_1_taisou1_tbl, cKF_ds_ply_1_taisou1_tbl, - cKF_kn_ply_1_taisou1_tbl, cKF_c_ply_1_taisou1_tbl, -1, 81 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_taisou1 = { + cKF_ckcb_r_ply_1_taisou1_tbl, cKF_ds_ply_1_taisou1_tbl, cKF_kn_ply_1_taisou1_tbl, cKF_c_ply_1_taisou1_tbl, -1, 81 +}; u8 cKF_ckcb_r_ply_1_taisou2_1_tbl[] = { 24, 2, 0, 7, 7, 3, 0, 7, 7, 3, 0, 7, 7, 2, 0, 7, 2, 0, 7, 2, 7, 7, 0, 7, 0, 0 }; @@ -7664,8 +8006,12 @@ s16 cKF_ds_ply_1_taisou2_1_tbl[] = { 1, 0, 0, 81, 0, 0, 1, 0, 0, 81, 0, 0, 1, 0, 0, 81, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_taisou2_1[] = { { cKF_ckcb_r_ply_1_taisou2_1_tbl, cKF_ds_ply_1_taisou2_1_tbl, - cKF_kn_ply_1_taisou2_1_tbl, cKF_c_ply_1_taisou2_1_tbl, -1, 81 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_taisou2_1 = { cKF_ckcb_r_ply_1_taisou2_1_tbl, + cKF_ds_ply_1_taisou2_1_tbl, + cKF_kn_ply_1_taisou2_1_tbl, + cKF_c_ply_1_taisou2_1_tbl, + -1, + 81 }; u8 cKF_ckcb_r_ply_1_taisou2_2_tbl[] = { 24, 2, 0, 7, 7, 3, 0, 7, 7, 3, 0, 7, 7, 2, 0, 7, 2, 0, 7, 2, 7, 7, 0, 7, 0, 0 }; @@ -7700,8 +8046,12 @@ s16 cKF_ds_ply_1_taisou2_2_tbl[] = { 81, 0, 0, 1, 0, 0, 81, 0, 0, 1, 0, 0, 81, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_taisou2_2[] = { { cKF_ckcb_r_ply_1_taisou2_2_tbl, cKF_ds_ply_1_taisou2_2_tbl, - cKF_kn_ply_1_taisou2_2_tbl, cKF_c_ply_1_taisou2_2_tbl, -1, 81 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_taisou2_2 = { cKF_ckcb_r_ply_1_taisou2_2_tbl, + cKF_ds_ply_1_taisou2_2_tbl, + cKF_kn_ply_1_taisou2_2_tbl, + cKF_c_ply_1_taisou2_2_tbl, + -1, + 81 }; u8 cKF_ckcb_r_ply_1_taisou3_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -7844,8 +8194,9 @@ s16 cKF_ds_ply_1_taisou3_tbl[] = { 161, 0, 0, 1, 0, 0, 161, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_taisou3[] = { { cKF_ckcb_r_ply_1_taisou3_tbl, cKF_ds_ply_1_taisou3_tbl, - cKF_kn_ply_1_taisou3_tbl, cKF_c_ply_1_taisou3_tbl, -1, 161 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_taisou3 = { + cKF_ckcb_r_ply_1_taisou3_tbl, cKF_ds_ply_1_taisou3_tbl, cKF_kn_ply_1_taisou3_tbl, cKF_c_ply_1_taisou3_tbl, -1, 161 +}; u8 cKF_ckcb_r_ply_1_taisou4_1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 2, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -7909,8 +8260,12 @@ s16 cKF_ds_ply_1_taisou4_1_tbl[] = { 1, 0, 0, 81, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_taisou4_1[] = { { cKF_ckcb_r_ply_1_taisou4_1_tbl, cKF_ds_ply_1_taisou4_1_tbl, - cKF_kn_ply_1_taisou4_1_tbl, cKF_c_ply_1_taisou4_1_tbl, -1, 81 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_taisou4_1 = { cKF_ckcb_r_ply_1_taisou4_1_tbl, + cKF_ds_ply_1_taisou4_1_tbl, + cKF_kn_ply_1_taisou4_1_tbl, + cKF_c_ply_1_taisou4_1_tbl, + -1, + 81 }; u8 cKF_ckcb_r_ply_1_taisou4_2_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 0, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -7971,8 +8326,12 @@ s16 cKF_ds_ply_1_taisou4_2_tbl[] = { 81, 0, 0, 1, 0, 0, 81, 0, 0, 1, 0, 0, 81, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_taisou4_2[] = { { cKF_ckcb_r_ply_1_taisou4_2_tbl, cKF_ds_ply_1_taisou4_2_tbl, - cKF_kn_ply_1_taisou4_2_tbl, cKF_c_ply_1_taisou4_2_tbl, -1, 81 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_taisou4_2 = { cKF_ckcb_r_ply_1_taisou4_2_tbl, + cKF_ds_ply_1_taisou4_2_tbl, + cKF_kn_ply_1_taisou4_2_tbl, + cKF_c_ply_1_taisou4_2_tbl, + -1, + 81 }; u8 cKF_ckcb_r_ply_1_taisou5_1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -8041,8 +8400,12 @@ s16 cKF_ds_ply_1_taisou5_1_tbl[] = { 81, 0, 0, 1, 0, 0, 81, 0, 0, 1, 0, 0, 81, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_taisou5_1[] = { { cKF_ckcb_r_ply_1_taisou5_1_tbl, cKF_ds_ply_1_taisou5_1_tbl, - cKF_kn_ply_1_taisou5_1_tbl, cKF_c_ply_1_taisou5_1_tbl, -1, 81 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_taisou5_1 = { cKF_ckcb_r_ply_1_taisou5_1_tbl, + cKF_ds_ply_1_taisou5_1_tbl, + cKF_kn_ply_1_taisou5_1_tbl, + cKF_c_ply_1_taisou5_1_tbl, + -1, + 81 }; u8 cKF_ckcb_r_ply_1_taisou5_2_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 3, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -8111,8 +8474,12 @@ s16 cKF_ds_ply_1_taisou5_2_tbl[] = { 81, 0, 0, 1, 0, 0, 81, 0, 0, 1, 0, 0, 81, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_taisou5_2[] = { { cKF_ckcb_r_ply_1_taisou5_2_tbl, cKF_ds_ply_1_taisou5_2_tbl, - cKF_kn_ply_1_taisou5_2_tbl, cKF_c_ply_1_taisou5_2_tbl, -1, 81 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_taisou5_2 = { cKF_ckcb_r_ply_1_taisou5_2_tbl, + cKF_ds_ply_1_taisou5_2_tbl, + cKF_kn_ply_1_taisou5_2_tbl, + cKF_c_ply_1_taisou5_2_tbl, + -1, + 81 }; u8 cKF_ckcb_r_ply_1_taisou6_1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 6, 7, 0, 7, 7, 7, 0, 7, 6, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -8162,8 +8529,12 @@ s16 cKF_ds_ply_1_taisou6_1_tbl[] = { 1, 0, 0, 81, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_taisou6_1[] = { { cKF_ckcb_r_ply_1_taisou6_1_tbl, cKF_ds_ply_1_taisou6_1_tbl, - cKF_kn_ply_1_taisou6_1_tbl, cKF_c_ply_1_taisou6_1_tbl, -1, 81 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_taisou6_1 = { cKF_ckcb_r_ply_1_taisou6_1_tbl, + cKF_ds_ply_1_taisou6_1_tbl, + cKF_kn_ply_1_taisou6_1_tbl, + cKF_c_ply_1_taisou6_1_tbl, + -1, + 81 }; u8 cKF_ckcb_r_ply_1_taisou6_2_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 6, 7, 0, 7, 7, 7, 0, 7, 6, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -8213,8 +8584,12 @@ s16 cKF_ds_ply_1_taisou6_2_tbl[] = { 1, 0, 0, 81, 0, 0, 1, 0, 0, 81, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_taisou6_2[] = { { cKF_ckcb_r_ply_1_taisou6_2_tbl, cKF_ds_ply_1_taisou6_2_tbl, - cKF_kn_ply_1_taisou6_2_tbl, cKF_c_ply_1_taisou6_2_tbl, -1, 81 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_taisou6_2 = { cKF_ckcb_r_ply_1_taisou6_2_tbl, + cKF_ds_ply_1_taisou6_2_tbl, + cKF_kn_ply_1_taisou6_2_tbl, + cKF_c_ply_1_taisou6_2_tbl, + -1, + 81 }; u8 cKF_ckcb_r_ply_1_taisou7_1_tbl[] = { 40, 3, 0, 7, 2, 3, 0, 7, 2, 3, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -8255,8 +8630,12 @@ s16 cKF_ds_ply_1_taisou7_1_tbl[] = { 81, 0, 0, 1, 0, 0, 81, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_taisou7_1[] = { { cKF_ckcb_r_ply_1_taisou7_1_tbl, cKF_ds_ply_1_taisou7_1_tbl, - cKF_kn_ply_1_taisou7_1_tbl, cKF_c_ply_1_taisou7_1_tbl, -1, 81 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_taisou7_1 = { cKF_ckcb_r_ply_1_taisou7_1_tbl, + cKF_ds_ply_1_taisou7_1_tbl, + cKF_kn_ply_1_taisou7_1_tbl, + cKF_c_ply_1_taisou7_1_tbl, + -1, + 81 }; u8 cKF_ckcb_r_ply_1_taisou7_2_tbl[] = { 40, 3, 0, 7, 2, 3, 0, 7, 2, 3, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; @@ -8297,8 +8676,12 @@ s16 cKF_ds_ply_1_taisou7_2_tbl[] = { 1, 0, 0, 81, 0, 0, 1, 0, 0, 81, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_taisou7_2[] = { { cKF_ckcb_r_ply_1_taisou7_2_tbl, cKF_ds_ply_1_taisou7_2_tbl, - cKF_kn_ply_1_taisou7_2_tbl, cKF_c_ply_1_taisou7_2_tbl, -1, 81 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_taisou7_2 = { cKF_ckcb_r_ply_1_taisou7_2_tbl, + cKF_ds_ply_1_taisou7_2_tbl, + cKF_kn_ply_1_taisou7_2_tbl, + cKF_c_ply_1_taisou7_2_tbl, + -1, + 81 }; u8 cKF_ckcb_r_ply_1_omairi_us1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 @@ -8336,5 +8719,9 @@ s16 cKF_ds_ply_1_omairi_us1_tbl[] = { 1, 0, 0, 46, 0, 0, 1, 0, 0, 46, 0, 0, 1, 0, 0, 46, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_ply_1_omairi_us1[] = { { cKF_ckcb_r_ply_1_omairi_us1_tbl, cKF_ds_ply_1_omairi_us1_tbl, - cKF_kn_ply_1_omairi_us1_tbl, cKF_c_ply_1_omairi_us1_tbl, -1, 46 } }; +cKF_Animation_R_c cKF_ba_r_ply_1_omairi_us1 = { cKF_ckcb_r_ply_1_omairi_us1_tbl, + cKF_ds_ply_1_omairi_us1_tbl, + cKF_kn_ply_1_omairi_us1_tbl, + cKF_c_ply_1_omairi_us1_tbl, + -1, + 46 }; diff --git a/src/data/model/player_tool.c b/src/data/model/player_tool.c index 58fe69ae..daddaef9 100644 --- a/src/data/model/player_tool.c +++ b/src/data/model/player_tool.c @@ -304,7 +304,7 @@ cKF_Joint_R_c cKF_je_r_tol_net_1_tbl[] = { { main2_net_model, 0, cKF_JOINT_FLAG_DISP_OPA, { 1900, 0, 0 } }, }; -cKF_Skeleton_R_c cKF_bs_r_tol_net_1[] = { { ARRAY_COUNT(cKF_je_r_tol_net_1_tbl), 3, cKF_je_r_tol_net_1_tbl } }; +cKF_Skeleton_R_c cKF_bs_r_tol_net_1 = { ARRAY_COUNT(cKF_je_r_tol_net_1_tbl), 3, cKF_je_r_tol_net_1_tbl }; u16 tol_net_2_pal[] ATTRIBUTE_ALIGN(32) = { #include "assets/tol_net_2_pal.inc" @@ -406,7 +406,7 @@ cKF_Joint_R_c cKF_je_r_tol_net_2_tbl[] = { { NULL, 1, cKF_JOINT_FLAG_DISP_OPA, { { main_netB_model, 1, cKF_JOINT_FLAG_DISP_OPA, { 100, 0, 0 } }, { main2_netB_model, 0, cKF_JOINT_FLAG_DISP_OPA, { 1900, 0, 0 } } }; -cKF_Skeleton_R_c cKF_bs_r_tol_net_2[] = { { ARRAY_COUNT(cKF_je_r_tol_net_2_tbl), 3, cKF_je_r_tol_net_2_tbl } }; +cKF_Skeleton_R_c cKF_bs_r_tol_net_2 = { ARRAY_COUNT(cKF_je_r_tol_net_2_tbl), 3, cKF_je_r_tol_net_2_tbl }; u8 cKF_ckcb_r_tol_net_1_get_m1_tbl[] = { 0, 0, 7, 0, 7, 7 }; @@ -423,8 +423,12 @@ s16 cKF_ds_tol_net_1_get_m1_tbl[] = { 24, -290, 1235, 29, 150, 1869, 34, 250, 0, 36, 100, -3725, 42, -600, 0, 48, 200, 0, 52, -100, 0 }; -cKF_Animation_R_c cKF_ba_r_tol_net_1_get_m1[] = { { cKF_ckcb_r_tol_net_1_get_m1_tbl, cKF_ds_tol_net_1_get_m1_tbl, - cKF_kn_tol_net_1_get_m1_tbl, cKF_c_tol_net_1_get_m1_tbl, -1, 52 } }; +cKF_Animation_R_c cKF_ba_r_tol_net_1_get_m1 = { cKF_ckcb_r_tol_net_1_get_m1_tbl, + cKF_ds_tol_net_1_get_m1_tbl, + cKF_kn_tol_net_1_get_m1_tbl, + cKF_c_tol_net_1_get_m1_tbl, + -1, + 52 }; u8 cKF_ckcb_r_tol_net_1_net_swing1_tbl[] = { 0, 0, 7, 0, 7, 7 }; @@ -437,10 +441,12 @@ s16 cKF_ds_tol_net_1_net_swing1_tbl[] = { 1, 0, 0, 10, 0, 0, 1, 0, 0, 10 -100, 0, 9, 0, 0, 10, 0, 0, 1, 0, 0, 10, 0, 0, 1, 0, 0, 10, 0, 0, 1, 0, 0, 5, -350, 0, 7, 0, 0, 10, -150, 0 }; -cKF_Animation_R_c cKF_ba_r_tol_net_1_net_swing1[] = { - { cKF_ckcb_r_tol_net_1_net_swing1_tbl, cKF_ds_tol_net_1_net_swing1_tbl, cKF_kn_tol_net_1_net_swing1_tbl, - cKF_c_tol_net_1_net_swing1_tbl, -1, 10 } -}; +cKF_Animation_R_c cKF_ba_r_tol_net_1_net_swing1 = { cKF_ckcb_r_tol_net_1_net_swing1_tbl, + cKF_ds_tol_net_1_net_swing1_tbl, + cKF_kn_tol_net_1_net_swing1_tbl, + cKF_c_tol_net_1_net_swing1_tbl, + -1, + 10 }; u8 cKF_ckcb_r_tol_net_1_kamae_main_m1_tbl[] = { 0, 0, 7, 0, 7, 7 }; @@ -455,10 +461,12 @@ s16 cKF_ds_tol_net_1_kamae_main_m1_tbl[] = { 1, 0, 0, 17, 0, 0, 1, 188, 3, 0, 373, 7, 25, 0, 11, 0, -381, 15, -25, 0, 17, -19, 188, 1, 18, 223, 3, 25, 0, 11, -25, 0, 17, 18, 223 }; -cKF_Animation_R_c cKF_ba_r_tol_net_1_kamae_main_m1[] = { - { cKF_ckcb_r_tol_net_1_kamae_main_m1_tbl, cKF_ds_tol_net_1_kamae_main_m1_tbl, cKF_kn_tol_net_1_kamae_main_m1_tbl, - cKF_c_tol_net_1_kamae_main_m1_tbl, -1, 17 } -}; +cKF_Animation_R_c cKF_ba_r_tol_net_1_kamae_main_m1 = { cKF_ckcb_r_tol_net_1_kamae_main_m1_tbl, + cKF_ds_tol_net_1_kamae_main_m1_tbl, + cKF_kn_tol_net_1_kamae_main_m1_tbl, + cKF_c_tol_net_1_kamae_main_m1_tbl, + -1, + 17 }; u8 cKF_ckcb_r_tol_net_1_kokeru_getup_n1_tbl[] = { 0, 0, 0, 0, 3, 7 }; @@ -477,10 +485,12 @@ s16 cKF_ds_tol_net_1_kokeru_getup_n1_tbl[] = { -773, 25, -307, 417, 26, -272, 1604, 28, -122, 2022, 31, -6, 412, 32, 0, 195 }; -cKF_Animation_R_c cKF_ba_r_tol_net_1_kokeru_getup_n1[] = { - { cKF_ckcb_r_tol_net_1_kokeru_getup_n1_tbl, cKF_ds_tol_net_1_kokeru_getup_n1_tbl, - cKF_kn_tol_net_1_kokeru_getup_n1_tbl, cKF_c_tol_net_1_kokeru_getup_n1_tbl, -1, 32 } -}; +cKF_Animation_R_c cKF_ba_r_tol_net_1_kokeru_getup_n1 = { cKF_ckcb_r_tol_net_1_kokeru_getup_n1_tbl, + cKF_ds_tol_net_1_kokeru_getup_n1_tbl, + cKF_kn_tol_net_1_kokeru_getup_n1_tbl, + cKF_c_tol_net_1_kokeru_getup_n1_tbl, + -1, + 32 }; u8 cKF_ckcb_r_tol_net_1_kokeru_n1_tbl[] = { 0, 0, 7, 0, 7, 7 }; @@ -496,9 +506,12 @@ s16 cKF_ds_tol_net_1_kokeru_n1_tbl[] = { 1, 0, 0, 31, 0, 0, 1, 0 10, 0, 0, 17, 700, 1073, 31, 900, 0, 1, 0, 0, 5, 500, 0, 8, -290, -3843, 11, -450, 0, 17, 0, 2439, 31, 390, 0 }; -cKF_Animation_R_c cKF_ba_r_tol_net_1_kokeru_n1[] = { { cKF_ckcb_r_tol_net_1_kokeru_n1_tbl, - cKF_ds_tol_net_1_kokeru_n1_tbl, cKF_kn_tol_net_1_kokeru_n1_tbl, - cKF_c_tol_net_1_kokeru_n1_tbl, -1, 31 } }; +cKF_Animation_R_c cKF_ba_r_tol_net_1_kokeru_n1 = { cKF_ckcb_r_tol_net_1_kokeru_n1_tbl, + cKF_ds_tol_net_1_kokeru_n1_tbl, + cKF_kn_tol_net_1_kokeru_n1_tbl, + cKF_c_tol_net_1_kokeru_n1_tbl, + -1, + 31 }; u8 cKF_ckcb_r_tol_net_1_swing_wait1_tbl[] = { 0, 0, 7, 0, 7, 7 }; @@ -513,10 +526,12 @@ s16 cKF_ds_tol_net_1_swing_wait1_tbl[] = { 1, 0, 0, 21, 0, 0, 1, 0, 0, 21, 0, 0, 1, 0, -6054, 3, -200, 0, 5, 0, 6067, 10, 700, 0, 18, -50, -1513, 21, -100, 0 }; -cKF_Animation_R_c cKF_ba_r_tol_net_1_swing_wait1[] = { - { cKF_ckcb_r_tol_net_1_swing_wait1_tbl, cKF_ds_tol_net_1_swing_wait1_tbl, cKF_kn_tol_net_1_swing_wait1_tbl, - cKF_c_tol_net_1_swing_wait1_tbl, -1, 21 } -}; +cKF_Animation_R_c cKF_ba_r_tol_net_1_swing_wait1 = { cKF_ckcb_r_tol_net_1_swing_wait1_tbl, + cKF_ds_tol_net_1_swing_wait1_tbl, + cKF_kn_tol_net_1_swing_wait1_tbl, + cKF_c_tol_net_1_swing_wait1_tbl, + -1, + 21 }; u8 cKF_ckcb_r_tol_net_1_yatta_m1_tbl[] = { 0, 0, 7, 0, 7, 7 }; @@ -535,9 +550,12 @@ s16 cKF_ds_tol_net_1_yatta_m1_tbl[] = { 44, 0, 0, 48, -200, -2347, 53, -550, 0 }; -cKF_Animation_R_c cKF_ba_r_tol_net_1_yatta_m1[] = { { cKF_ckcb_r_tol_net_1_yatta_m1_tbl, cKF_ds_tol_net_1_yatta_m1_tbl, - cKF_kn_tol_net_1_yatta_m1_tbl, cKF_c_tol_net_1_yatta_m1_tbl, -1, - 53 } }; +cKF_Animation_R_c cKF_ba_r_tol_net_1_yatta_m1 = { cKF_ckcb_r_tol_net_1_yatta_m1_tbl, + cKF_ds_tol_net_1_yatta_m1_tbl, + cKF_kn_tol_net_1_yatta_m1_tbl, + cKF_c_tol_net_1_yatta_m1_tbl, + -1, + 53 }; static u16 tol_sao_1_pal[] ATTRIBUTE_ALIGN(32) = { #include "assets/player_tool/tol_sao_1_pal.inc" @@ -634,7 +652,7 @@ cKF_Joint_R_c cKF_je_r_tol_sao_1_tbl[] = { { NULL, 1, cKF_JOINT_FLAG_DISP_OPA, { { main3_sao_model, 1, cKF_JOINT_FLAG_DISP_OPA, { 1850, 0, 0 } }, { main4_sao_model, 0, cKF_JOINT_FLAG_DISP_OPA, { 1600, 0, 0 } } }; -cKF_Skeleton_R_c cKF_bs_r_tol_sao_1[] = { { ARRAY_COUNT(cKF_je_r_tol_sao_1_tbl), 4, cKF_je_r_tol_sao_1_tbl } }; +cKF_Skeleton_R_c cKF_bs_r_tol_sao_1 = { ARRAY_COUNT(cKF_je_r_tol_sao_1_tbl), 4, cKF_je_r_tol_sao_1_tbl }; static u16 tol_sao_2_pal[] ATTRIBUTE_ALIGN(32) = { #include "assets/player_tool/tol_sao_2_pal.inc" @@ -731,7 +749,7 @@ cKF_Joint_R_c cKF_je_r_tol_sao_2_tbl[] = { { NULL, 1, cKF_JOINT_FLAG_DISP_OPA, { { main3_saoB_model, 1, cKF_JOINT_FLAG_DISP_OPA, { 1850, 0, 0 } }, { main4_saoB_model, 0, cKF_JOINT_FLAG_DISP_OPA, { 1600, 0, 0 } } }; -cKF_Skeleton_R_c cKF_bs_r_tol_sao_2[] = { { ARRAY_COUNT(cKF_je_r_tol_sao_2_tbl), 4, cKF_je_r_tol_sao_2_tbl } }; +cKF_Skeleton_R_c cKF_bs_r_tol_sao_2 = { ARRAY_COUNT(cKF_je_r_tol_sao_2_tbl), 4, cKF_je_r_tol_sao_2_tbl }; u8 cKF_ckcb_r_tol_sao_1_sao_get_t1_tbl[] = { 0, 0, 1, 1, 1 }; @@ -747,10 +765,12 @@ s16 cKF_ds_tol_sao_1_sao_get_t1_tbl[] = { 1, -150, -279, 3, -160, 139, 8, 3107, 9, 0, 2602, 10, 70, 1345, 13, 45, -925, 14, 14, -673, 15, 0, -210, 16, 0, 0, 22, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_tol_sao_1_sao_get_t1[] = { - { cKF_ckcb_r_tol_sao_1_sao_get_t1_tbl, cKF_ds_tol_sao_1_sao_get_t1_tbl, cKF_kn_tol_sao_1_sao_get_t1_tbl, - cKF_c_tol_sao_1_sao_get_t1_tbl, -1, 22 } -}; +cKF_Animation_R_c cKF_ba_r_tol_sao_1_sao_get_t1 = { cKF_ckcb_r_tol_sao_1_sao_get_t1_tbl, + cKF_ds_tol_sao_1_sao_get_t1_tbl, + cKF_kn_tol_sao_1_sao_get_t1_tbl, + cKF_c_tol_sao_1_sao_get_t1_tbl, + -1, + 22 }; u8 cKF_ckcb_r_tol_sao_1_sao_move1_tbl[] = { 56, 7, 1, 7, 7 }; @@ -765,9 +785,12 @@ s16 cKF_ds_tol_sao_1_sao_move1_tbl[] = { 1, 0, 0, 17, 0, 0, 1, 69, -1141, 4, -45, 0, 8, 90, 0, 12, -45, 0, 16, 90, 0, 17, 69, -1141 }; -cKF_Animation_R_c cKF_ba_r_tol_sao_1_sao_move1[] = { { cKF_ckcb_r_tol_sao_1_sao_move1_tbl, - cKF_ds_tol_sao_1_sao_move1_tbl, cKF_kn_tol_sao_1_sao_move1_tbl, - cKF_c_tol_sao_1_sao_move1_tbl, -1, 17 } }; +cKF_Animation_R_c cKF_ba_r_tol_sao_1_sao_move1 = { cKF_ckcb_r_tol_sao_1_sao_move1_tbl, + cKF_ds_tol_sao_1_sao_move1_tbl, + cKF_kn_tol_sao_1_sao_move1_tbl, + cKF_c_tol_sao_1_sao_move1_tbl, + -1, + 17 }; u8 cKF_ckcb_r_tol_sao_1_sao_sinari1_tbl[] = { 0, 0, 1, 1, 1 }; @@ -778,10 +801,12 @@ s16 cKF_c_tol_sao_1_sao_sinari1_tbl[] = { 0, 0, 0, 900, 0, 0, 0, 0, 900, 0, 0, 0 s16 cKF_ds_tol_sao_1_sao_sinari1_tbl[] = { 1, 300, -50, 360, -300, -50, 1, 600, -100, 360, -600, -100, 1, 900, -150, 360, -900, -150 }; -cKF_Animation_R_c cKF_ba_r_tol_sao_1_sao_sinari1[] = { - { cKF_ckcb_r_tol_sao_1_sao_sinari1_tbl, cKF_ds_tol_sao_1_sao_sinari1_tbl, cKF_kn_tol_sao_1_sao_sinari1_tbl, - cKF_c_tol_sao_1_sao_sinari1_tbl, -1, 360 } -}; +cKF_Animation_R_c cKF_ba_r_tol_sao_1_sao_sinari1 = { cKF_ckcb_r_tol_sao_1_sao_sinari1_tbl, + cKF_ds_tol_sao_1_sao_sinari1_tbl, + cKF_kn_tol_sao_1_sao_sinari1_tbl, + cKF_c_tol_sao_1_sao_sinari1_tbl, + -1, + 360 }; u8 cKF_ckcb_r_tol_sao_1_sao_swing1_tbl[] = { 0, 0, 1, 1, 1 }; @@ -801,10 +826,12 @@ s16 cKF_ds_tol_sao_1_sao_swing1_tbl[] = { -111, 1667, 23, -39, 1667, 24, 0, 583, 25, 0, 0, 34, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_tol_sao_1_sao_swing1[] = { - { cKF_ckcb_r_tol_sao_1_sao_swing1_tbl, cKF_ds_tol_sao_1_sao_swing1_tbl, cKF_kn_tol_sao_1_sao_swing1_tbl, - cKF_c_tol_sao_1_sao_swing1_tbl, -1, 34 } -}; +cKF_Animation_R_c cKF_ba_r_tol_sao_1_sao_swing1 = { cKF_ckcb_r_tol_sao_1_sao_swing1_tbl, + cKF_ds_tol_sao_1_sao_swing1_tbl, + cKF_kn_tol_sao_1_sao_swing1_tbl, + cKF_c_tol_sao_1_sao_swing1_tbl, + -1, + 34 }; u8 cKF_ckcb_r_tol_sao_1_sao_wait1_tbl[] = { 56, 7, 7, 7, 7 }; @@ -821,9 +848,12 @@ s16 cKF_ds_tol_sao_1_sao_wait1_tbl[] = { 1, 0, 0, 33, 0, 0, 1, 0, 0, 3 1, 0, 0, 3, 0, 0, 33, 0, 0, 1, -24, -569, 3, -45, 0, 10, 90, 0, 19, -45, 0, 27, 90, 0, 33, -24, -569 }; -cKF_Animation_R_c cKF_ba_r_tol_sao_1_sao_wait1[] = { { cKF_ckcb_r_tol_sao_1_sao_wait1_tbl, - cKF_ds_tol_sao_1_sao_wait1_tbl, cKF_kn_tol_sao_1_sao_wait1_tbl, - cKF_c_tol_sao_1_sao_wait1_tbl, -1, 33 } }; +cKF_Animation_R_c cKF_ba_r_tol_sao_1_sao_wait1 = { cKF_ckcb_r_tol_sao_1_sao_wait1_tbl, + cKF_ds_tol_sao_1_sao_wait1_tbl, + cKF_kn_tol_sao_1_sao_wait1_tbl, + cKF_c_tol_sao_1_sao_wait1_tbl, + -1, + 33 }; u8 cKF_ckcb_r_tol_sao_1_not_sao_swing1_tbl[] = { 0, 0, 1, 1, 1 }; @@ -841,10 +871,12 @@ s16 cKF_ds_tol_sao_1_not_sao_swing1_tbl[] = { 26, 7, 1000, 27, 30, 125, 28, 15, -450, 29, 0, -225, 30, 0, 0, 34, 0, 0 }; -cKF_Animation_R_c cKF_ba_r_tol_sao_1_not_sao_swing1[] = { - { cKF_ckcb_r_tol_sao_1_not_sao_swing1_tbl, cKF_ds_tol_sao_1_not_sao_swing1_tbl, cKF_kn_tol_sao_1_not_sao_swing1_tbl, - cKF_c_tol_sao_1_not_sao_swing1_tbl, -1, 34 } -}; +cKF_Animation_R_c cKF_ba_r_tol_sao_1_not_sao_swing1 = { cKF_ckcb_r_tol_sao_1_not_sao_swing1_tbl, + cKF_ds_tol_sao_1_not_sao_swing1_tbl, + cKF_kn_tol_sao_1_not_sao_swing1_tbl, + cKF_c_tol_sao_1_not_sao_swing1_tbl, + -1, + 34 }; u16 act_m_scoop_1_pal[] ATTRIBUTE_ALIGN(32) = { #include "assets/act_m_scoop_1_pal.inc" @@ -1096,7 +1128,7 @@ cKF_Joint_R_c cKF_je_r_tol_balloon1_tbl[] = { { NULL, 1, cKF_JOINT_FLAG_DISP_OPA { NULL, 1, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } }, { tol_balloonA_head_model, 0, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } } }; -cKF_Skeleton_R_c cKF_bs_r_tol_balloon1[] = { { ARRAY_COUNT(cKF_je_r_tol_balloon1_tbl), 4, cKF_je_r_tol_balloon1_tbl } }; +cKF_Skeleton_R_c cKF_bs_r_tol_balloon1 = { ARRAY_COUNT(cKF_je_r_tol_balloon1_tbl), 4, cKF_je_r_tol_balloon1_tbl }; u8 tol_balloonB_wire_tex_txt[] ATTRIBUTE_ALIGN(32) = { #include "assets/tol_balloonB_wire_tex_txt.inc" @@ -1200,7 +1232,7 @@ cKF_Joint_R_c cKF_je_r_tol_balloon2_tbl[] = { { NULL, 1, cKF_JOINT_FLAG_DISP_OPA { NULL, 1, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } }, { tol_balloonB_head_model, 0, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } } }; -cKF_Skeleton_R_c cKF_bs_r_tol_balloon2[] = { { ARRAY_COUNT(cKF_je_r_tol_balloon2_tbl), 4, cKF_je_r_tol_balloon2_tbl } }; +cKF_Skeleton_R_c cKF_bs_r_tol_balloon2 = { ARRAY_COUNT(cKF_je_r_tol_balloon2_tbl), 4, cKF_je_r_tol_balloon2_tbl }; u8 tol_balloonC_wire_tex_txt[] ATTRIBUTE_ALIGN(32) = { #include "assets/tol_balloonC_wire_tex_txt.inc" @@ -1306,7 +1338,7 @@ cKF_Joint_R_c cKF_je_r_tol_balloon3_tbl[] = { { tol_balloonC_head_model, 0, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } }, }; -cKF_Skeleton_R_c cKF_bs_r_tol_balloon3[] = { { ARRAY_COUNT(cKF_je_r_tol_balloon3_tbl), 4, cKF_je_r_tol_balloon3_tbl } }; +cKF_Skeleton_R_c cKF_bs_r_tol_balloon3 = { ARRAY_COUNT(cKF_je_r_tol_balloon3_tbl), 4, cKF_je_r_tol_balloon3_tbl }; u8 tol_balloonD_wire_tex_txt[] ATTRIBUTE_ALIGN(32) = { #include "assets/tol_balloonD_wire_tex_txt.inc" @@ -1410,7 +1442,7 @@ cKF_Joint_R_c cKF_je_r_tol_balloon4_tbl[] = { { NULL, 1, cKF_JOINT_FLAG_DISP_OPA { NULL, 1, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } }, { tol_balloonD_head_model, 0, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } } }; -cKF_Skeleton_R_c cKF_bs_r_tol_balloon4[] = { { ARRAY_COUNT(cKF_je_r_tol_balloon4_tbl), 4, cKF_je_r_tol_balloon4_tbl } }; +cKF_Skeleton_R_c cKF_bs_r_tol_balloon4 = { ARRAY_COUNT(cKF_je_r_tol_balloon4_tbl), 4, cKF_je_r_tol_balloon4_tbl }; u8 tol_balloonE_wire_tex_txt[] ATTRIBUTE_ALIGN(32) = { #include "assets/tol_balloonE_wire_tex_txt.inc" @@ -1514,7 +1546,7 @@ cKF_Joint_R_c cKF_je_r_tol_balloon5_tbl[] = { { NULL, 1, cKF_JOINT_FLAG_DISP_OPA { NULL, 1, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } }, { tol_balloonE_head_model, 0, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } } }; -cKF_Skeleton_R_c cKF_bs_r_tol_balloon5[] = { { ARRAY_COUNT(cKF_je_r_tol_balloon5_tbl), 4, cKF_je_r_tol_balloon5_tbl } }; +cKF_Skeleton_R_c cKF_bs_r_tol_balloon5 = { ARRAY_COUNT(cKF_je_r_tol_balloon5_tbl), 4, cKF_je_r_tol_balloon5_tbl }; u8 tol_balloonF_wire_tex_txt[] ATTRIBUTE_ALIGN(32) = { #include "assets/tol_balloonF_wire_tex_txt.inc" @@ -1643,7 +1675,7 @@ cKF_Joint_R_c cKF_je_r_tol_balloon6_tbl[] = { { NULL, 1, cKF_JOINT_FLAG_DISP_OPA { NULL, 1, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } }, { tol_balloonF_head_model, 0, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } } }; -cKF_Skeleton_R_c cKF_bs_r_tol_balloon6[] = { { ARRAY_COUNT(cKF_je_r_tol_balloon6_tbl), 4, cKF_je_r_tol_balloon6_tbl } }; +cKF_Skeleton_R_c cKF_bs_r_tol_balloon6 = { ARRAY_COUNT(cKF_je_r_tol_balloon6_tbl), 4, cKF_je_r_tol_balloon6_tbl }; u8 tol_balloonG_wire_tex_txt[] ATTRIBUTE_ALIGN(32) = { #include "assets/tol_balloonG_wire_tex_txt.inc" @@ -1772,7 +1804,7 @@ cKF_Joint_R_c cKF_je_r_tol_balloon7_tbl[] = { { NULL, 1, cKF_JOINT_FLAG_DISP_OPA { NULL, 1, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } }, { tol_balloonG_head_model, 0, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } } }; -cKF_Skeleton_R_c cKF_bs_r_tol_balloon7[] = { { ARRAY_COUNT(cKF_je_r_tol_balloon7_tbl), 4, cKF_je_r_tol_balloon7_tbl } }; +cKF_Skeleton_R_c cKF_bs_r_tol_balloon7 = { ARRAY_COUNT(cKF_je_r_tol_balloon7_tbl), 4, cKF_je_r_tol_balloon7_tbl }; u8 tol_balloonH_wire_tex_txt[] ATTRIBUTE_ALIGN(32) = { #include "assets/tol_balloonH_wire_tex_txt.inc" @@ -1901,7 +1933,7 @@ cKF_Joint_R_c cKF_je_r_tol_balloon8_tbl[] = { { NULL, 1, cKF_JOINT_FLAG_DISP_OPA { NULL, 1, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } }, { tol_balloonH_head_model, 0, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } } }; -cKF_Skeleton_R_c cKF_bs_r_tol_balloon8[] = { { ARRAY_COUNT(cKF_je_r_tol_balloon8_tbl), 4, cKF_je_r_tol_balloon8_tbl } }; +cKF_Skeleton_R_c cKF_bs_r_tol_balloon8 = { ARRAY_COUNT(cKF_je_r_tol_balloon8_tbl), 4, cKF_je_r_tol_balloon8_tbl }; u8 cKF_ckcb_r_tol_balloon1_wait_tbl[] = { 0, 3, 7, 7, 0, 0, 7 }; @@ -1918,9 +1950,12 @@ s16 cKF_ds_tol_balloon1_wait_tbl[] = { 1, -50, 0, 31, 50, 0, 61, - 1, -52, -150, 9, -75, 1, 39, 75, 13, 61, -52, -150, 1, 103, 331, 9, 150, -1, 39, -150, -2, 61, 103, 300 }; -cKF_Animation_R_c cKF_ba_r_tol_balloon1_wait[] = { { cKF_ckcb_r_tol_balloon1_wait_tbl, cKF_ds_tol_balloon1_wait_tbl, - cKF_kn_tol_balloon1_wait_tbl, cKF_c_tol_balloon1_wait_tbl, -1, - 61 } }; +cKF_Animation_R_c cKF_ba_r_tol_balloon1_wait = { cKF_ckcb_r_tol_balloon1_wait_tbl, + cKF_ds_tol_balloon1_wait_tbl, + cKF_kn_tol_balloon1_wait_tbl, + cKF_c_tol_balloon1_wait_tbl, + -1, + 61 }; u8 cKF_ckcb_r_tol_balloon1_gyaza1_tbl[] = { 0, 7, 7, 7, 0, 0, 7 }; @@ -1969,9 +2004,12 @@ s16 cKF_ds_tol_balloon1_gyaza1_tbl[] = { 25, -201, 780, 26, -161, 3008, 27, 0, 5394 }; -cKF_Animation_R_c cKF_ba_r_tol_balloon1_gyaza1[] = { { cKF_ckcb_r_tol_balloon1_gyaza1_tbl, - cKF_ds_tol_balloon1_gyaza1_tbl, cKF_kn_tol_balloon1_gyaza1_tbl, - cKF_c_tol_balloon1_gyaza1_tbl, -1, 27 } }; +cKF_Animation_R_c cKF_ba_r_tol_balloon1_gyaza1 = { cKF_ckcb_r_tol_balloon1_gyaza1_tbl, + cKF_ds_tol_balloon1_gyaza1_tbl, + cKF_kn_tol_balloon1_gyaza1_tbl, + cKF_c_tol_balloon1_gyaza1_tbl, + -1, + 27 }; static u16 tol_kaza_1_pal[] ATTRIBUTE_ALIGN(32) = { #include "assets/player_tool/tol_kaza_1_pal.inc" @@ -2037,7 +2075,7 @@ cKF_Joint_R_c cKF_je_r_tol_kaza1_tbl[] = { { NULL, 1, cKF_JOINT_FLAG_DISP_OPA, { { tol_kaza1_base_model, 1, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } }, { tol_kaza1_fan_model, 0, cKF_JOINT_FLAG_DISP_OPA, { 2250, 0, 0 } } }; -cKF_Skeleton_R_c cKF_bs_r_tol_kaza1[] = { { ARRAY_COUNT(cKF_je_r_tol_kaza1_tbl), 2, cKF_je_r_tol_kaza1_tbl } }; +cKF_Skeleton_R_c cKF_bs_r_tol_kaza1 = { ARRAY_COUNT(cKF_je_r_tol_kaza1_tbl), 2, cKF_je_r_tol_kaza1_tbl }; static u16 tol_kaza_2_pal[] ATTRIBUTE_ALIGN(32) = { #include "assets/player_tool/tol_kaza_2_pal.inc" @@ -2103,7 +2141,7 @@ cKF_Joint_R_c cKF_je_r_tol_kaza2_tbl[] = { { NULL, 1, cKF_JOINT_FLAG_DISP_OPA, { { tol_kaza2_base_model, 1, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } }, { tol_kaza2_fan_model, 0, cKF_JOINT_FLAG_DISP_OPA, { 2250, 0, 0 } } }; -cKF_Skeleton_R_c cKF_bs_r_tol_kaza2[] = { { ARRAY_COUNT(cKF_je_r_tol_kaza2_tbl), 2, cKF_je_r_tol_kaza2_tbl } }; +cKF_Skeleton_R_c cKF_bs_r_tol_kaza2 = { ARRAY_COUNT(cKF_je_r_tol_kaza2_tbl), 2, cKF_je_r_tol_kaza2_tbl }; static u16 tol_kaza_3_pal[] ATTRIBUTE_ALIGN(32) = { #include "assets/player_tool/tol_kaza_3_pal.inc" @@ -2169,7 +2207,7 @@ cKF_Joint_R_c cKF_je_r_tol_kaza3_tbl[] = { { NULL, 1, cKF_JOINT_FLAG_DISP_OPA, { { tol_kaza3_base_model, 1, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } }, { tol_kaza3_fan_model, 0, cKF_JOINT_FLAG_DISP_OPA, { 2250, 0, 0 } } }; -cKF_Skeleton_R_c cKF_bs_r_tol_kaza3[] = { { ARRAY_COUNT(cKF_je_r_tol_kaza3_tbl), 2, cKF_je_r_tol_kaza3_tbl } }; +cKF_Skeleton_R_c cKF_bs_r_tol_kaza3 = { ARRAY_COUNT(cKF_je_r_tol_kaza3_tbl), 2, cKF_je_r_tol_kaza3_tbl }; static u16 tol_kaza_4_pal[] ATTRIBUTE_ALIGN(32) = { #include "assets/player_tool/tol_kaza_4_pal.inc" @@ -2235,7 +2273,7 @@ cKF_Joint_R_c cKF_je_r_tol_kaza4_tbl[] = { { NULL, 1, cKF_JOINT_FLAG_DISP_OPA, { { tol_kaza4_base_model, 1, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } }, { tol_kaza4_fan_model, 0, cKF_JOINT_FLAG_DISP_OPA, { 2250, 0, 0 } } }; -cKF_Skeleton_R_c cKF_bs_r_tol_kaza4[] = { { ARRAY_COUNT(cKF_je_r_tol_kaza4_tbl), 2, cKF_je_r_tol_kaza4_tbl } }; +cKF_Skeleton_R_c cKF_bs_r_tol_kaza4 = { ARRAY_COUNT(cKF_je_r_tol_kaza4_tbl), 2, cKF_je_r_tol_kaza4_tbl }; static u16 tol_kaza_5_pal[] ATTRIBUTE_ALIGN(32) = { #include "assets/player_tool/tol_kaza_5_pal.inc" @@ -2301,7 +2339,7 @@ cKF_Joint_R_c cKF_je_r_tol_kaza5_tbl[] = { { NULL, 1, cKF_JOINT_FLAG_DISP_OPA, { { tol_kaza5_base_model, 1, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } }, { tol_kaza5_fan_model, 0, cKF_JOINT_FLAG_DISP_OPA, { 2250, 0, 0 } } }; -cKF_Skeleton_R_c cKF_bs_r_tol_kaza5[] = { { ARRAY_COUNT(cKF_je_r_tol_kaza5_tbl), 2, cKF_je_r_tol_kaza5_tbl } }; +cKF_Skeleton_R_c cKF_bs_r_tol_kaza5 = { ARRAY_COUNT(cKF_je_r_tol_kaza5_tbl), 2, cKF_je_r_tol_kaza5_tbl }; static u16 tol_kaza_6_pal[] ATTRIBUTE_ALIGN(32) = { #include "assets/player_tool/tol_kaza_6_pal.inc" @@ -2367,7 +2405,7 @@ cKF_Joint_R_c cKF_je_r_tol_kaza6_tbl[] = { { NULL, 1, cKF_JOINT_FLAG_DISP_OPA, { { tol_kaza6_base_model, 1, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } }, { tol_kaza6_fan_model, 0, cKF_JOINT_FLAG_DISP_OPA, { 2250, 0, 0 } } }; -cKF_Skeleton_R_c cKF_bs_r_tol_kaza6[] = { { ARRAY_COUNT(cKF_je_r_tol_kaza6_tbl), 2, cKF_je_r_tol_kaza6_tbl } }; +cKF_Skeleton_R_c cKF_bs_r_tol_kaza6 = { ARRAY_COUNT(cKF_je_r_tol_kaza6_tbl), 2, cKF_je_r_tol_kaza6_tbl }; static u16 tol_kaza_7_pal[] ATTRIBUTE_ALIGN(32) = { #include "assets/player_tool/tol_kaza_7_pal.inc" @@ -2477,7 +2515,7 @@ cKF_Joint_R_c cKF_je_r_tol_kaza7_tbl[] = { { NULL, 1, cKF_JOINT_FLAG_DISP_OPA, { { tol_kaza7_base_model, 1, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } }, { tol_kaza7_fan_model, 0, cKF_JOINT_FLAG_DISP_OPA, { 2250, 0, 0 } } }; -cKF_Skeleton_R_c cKF_bs_r_tol_kaza7[] = { { ARRAY_COUNT(cKF_je_r_tol_kaza7_tbl), 2, cKF_je_r_tol_kaza7_tbl } }; +cKF_Skeleton_R_c cKF_bs_r_tol_kaza7 = { ARRAY_COUNT(cKF_je_r_tol_kaza7_tbl), 2, cKF_je_r_tol_kaza7_tbl }; static u16 tol_kaza_8_pal[] ATTRIBUTE_ALIGN(32) = { #include "assets/player_tool/tol_kaza_8_pal.inc" @@ -2588,7 +2626,7 @@ cKF_Joint_R_c cKF_je_r_tol_kaza8_tbl[] = { { NULL, 1, cKF_JOINT_FLAG_DISP_OPA, { { tol_kaza8_base_model, 1, cKF_JOINT_FLAG_DISP_OPA, { 0, 0, 0 } }, { tol_kaza8_fan_model, 0, cKF_JOINT_FLAG_DISP_OPA, { 2250, 0, 0 } } }; -cKF_Skeleton_R_c cKF_bs_r_tol_kaza8[] = { { ARRAY_COUNT(cKF_je_r_tol_kaza8_tbl), 2, cKF_je_r_tol_kaza8_tbl } }; +cKF_Skeleton_R_c cKF_bs_r_tol_kaza8 = { ARRAY_COUNT(cKF_je_r_tol_kaza8_tbl), 2, cKF_je_r_tol_kaza8_tbl }; u8 cKF_ckcb_r_tol_kaza1_wait_tbl[] = { 56, 7, 7 }; @@ -2600,8 +2638,12 @@ s16 cKF_ds_tol_kaza1_wait_tbl[] = { 1, 0, 0, 361, 0, 0, 1, 0, 0, 361, 0, 0 1, 0, 0, 361, 0, 0, 1, -900, 0, 361, -900, 0, 1, 0, 0, 361, 0, 0, 1, 0, 0, 361, 0, 0, 1, 0, 0, 361, 0, 0, 1, 0, 300, 361, 3600, 300 }; -cKF_Animation_R_c cKF_ba_r_tol_kaza1_wait[] = { { cKF_ckcb_r_tol_kaza1_wait_tbl, cKF_ds_tol_kaza1_wait_tbl, - cKF_kn_tol_kaza1_wait_tbl, cKF_c_tol_kaza1_wait_tbl, -1, 361 } }; +cKF_Animation_R_c cKF_ba_r_tol_kaza1_wait = { cKF_ckcb_r_tol_kaza1_wait_tbl, + cKF_ds_tol_kaza1_wait_tbl, + cKF_kn_tol_kaza1_wait_tbl, + cKF_c_tol_kaza1_wait_tbl, + -1, + 361 }; static u16 tol_fan1_pal[] ATTRIBUTE_ALIGN(32) = { #include "assets/player_tool/tol_fan1_pal.inc" diff --git a/src/data/model/rom_myhome_ug.c b/src/data/model/rom_myhome_ug.c new file mode 100644 index 00000000..67a5f37a --- /dev/null +++ b/src/data/model/rom_myhome_ug.c @@ -0,0 +1,93 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" + +u16 rom_myhome_ug_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/rom_myhome_ug_pal.inc" +}; + +static u16 rom_myhome_pal[] ATTRIBUTE_ALIGN(32) = { +#include "assets/rom_myhome_ug/rom_myhome_pal.inc" +}; + +u8 rom_myhome_ugf1_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/rom_myhome_ugf1_tex.inc" +}; + +static u8 rom_myhome_enter2_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/rom_myhome_ug/rom_myhome_enter2_tex.inc" +}; + +u8 rom_myhome_ugw1_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/rom_myhome_ugw1_tex.inc" +}; + +u8 rom_myhome_ugw2_tex[] ATTRIBUTE_ALIGN(32) = { +#include "assets/rom_myhome_ugw2_tex.inc" +}; + +Vtx rom_myhome_ug_v[] = { +#include "assets/rom_myhome_ug_v.inc" +}; + +Gfx rom_myhome_ug_model[] = { + gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_TEX_EDGE2), + gsDPLoadTLUT_Dolphin(15, 16, 1, rom_myhome_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, rom_myhome_enter2_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_MIRROR, GX_MIRROR, 0, 0), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_SHADING_SMOOTH), + gsSPVertex(rom_myhome_ug_v, 5, 0), + gsSPNTrianglesInit_5b(3, 0, 1, 2, 1, 3, 2, 0, 4, 1), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), + gsDPLoadTLUT_Dolphin(15, 16, 1, rom_myhome_ug_pal), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, rom_myhome_ugf1_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_REPEAT, GX_REPEAT, 0, 0), + gsSPVertex(&rom_myhome_ug_v[5], 28, 0), + gsSPNTrianglesInit_5b(35, 0, 1, 2, 3, 4, 0, 0, 4, 1), + gsSPNTriangles_5b(4, 5, 1, 6, 7, 8, 9, 6, 8, 10, 6, 9), + gsSPNTriangles_5b(9, 8, 11, 9, 11, 12, 10, 9, 12, 13, 5, 12), + gsSPNTriangles_5b(13, 12, 2, 7, 14, 15, 15, 14, 16, 14, 17, 16), + gsSPNTriangles_5b(15, 16, 18, 19, 20, 18, 19, 17, 20, 17, 21, 20), + gsSPNTriangles_5b(21, 22, 20, 21, 23, 22, 17, 24, 21, 21, 24, 23), + gsSPNTriangles_5b(24, 3, 23, 20, 22, 18, 22, 2, 18, 2, 11, 18), + gsSPNTriangles_5b(2, 25, 11, 22, 3, 2, 22, 26, 3, 3, 0, 2), + gsSPNTriangles_5b(7, 15, 18, 11, 27, 7, 11, 7, 18, 25, 5, 10), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, rom_myhome_ugw1_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_REPEAT, GX_CLAMP, 0, 0), + gsSPVertex(&rom_myhome_ug_v[33], 32, 0), + gsSPNTrianglesInit_5b(38, 0, 1, 2, 0, 3, 1, 4, 5, 2), + gsSPNTriangles_5b(4, 6, 5, 7, 8, 9, 7, 10, 8, 7, 11, 10), + gsSPNTriangles_5b(7, 12, 11, 1, 8, 2, 8, 10, 2, 3, 9, 1), + gsSPNTriangles_5b(9, 8, 1, 3, 13, 9, 12, 14, 6, 4, 12, 6), + gsSPNTriangles_5b(4, 11, 12, 2, 11, 4, 2, 15, 11, 16, 17, 18), + gsSPNTriangles_5b(16, 18, 19, 19, 18, 20, 19, 20, 3, 20, 13, 3), + gsSPNTriangles_5b(21, 22, 23, 23, 24, 25, 21, 23, 25, 24, 26, 16), + gsSPNTriangles_5b(25, 24, 16, 27, 20, 18, 27, 18, 26, 27, 26, 24), + gsSPNTriangles_5b(27, 24, 23, 19, 3, 0, 19, 0, 16, 28, 21, 25), + gsSPNTriangles_5b(28, 25, 16, 5, 29, 30, 5, 6, 29, 0, 0, 0), + gsSPVertex(&rom_myhome_ug_v[64], 15, 0), + gsSPNTrianglesInit_5b(16, 0, 1, 2, 0, 3, 1, 4, 5, 6), + gsSPNTriangles_5b(4, 7, 5, 4, 8, 7, 4, 9, 8, 10, 5, 2), + gsSPNTriangles_5b(5, 7, 2, 11, 6, 10, 6, 5, 10, 11, 12, 6), + gsSPNTriangles_5b(9, 13, 3, 0, 9, 3, 0, 8, 9, 2, 8, 0), + gsSPNTriangles_5b(2, 14, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsDPSetTextureImage_Dolphin(G_IM_FMT_CI, G_IM_SIZ_4b, 64, 64, rom_myhome_ugw2_tex), + gsDPSetTile_Dolphin(G_DOLPHIN_TLUT_DEFAULT_MODE, 0, 15, GX_REPEAT, GX_CLAMP, 0, 0), + gsSPVertex(&rom_myhome_ug_v[79], 32, 0), + gsSPNTrianglesInit_5b(24, 0, 1, 2, 0, 3, 1, 0, 4, 3), + gsSPNTriangles_5b(0, 5, 4, 6, 7, 8, 7, 4, 8, 7, 9, 4), + gsSPNTriangles_5b(9, 10, 1, 10, 2, 1, 10, 11, 2, 12, 13, 7), + gsSPNTriangles_5b(10, 14, 15, 16, 17, 18, 15, 14, 19, 16, 20, 21), + gsSPNTriangles_5b(16, 21, 22, 23, 16, 22, 19, 23, 24, 19, 24, 25), + gsSPNTriangles_5b(26, 19, 25, 27, 28, 24, 27, 24, 29, 27, 29, 22), + gsSPNTriangles_5b(27, 22, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPVertex(&rom_myhome_ug_v[109], 15, 0), + gsSPNTrianglesInit_5b(12, 0, 1, 2, 0, 3, 1, 0, 4, 3), + gsSPNTriangles_5b(0, 5, 4, 6, 7, 8, 7, 4, 8, 7, 9, 4), + gsSPNTriangles_5b(9, 10, 1, 10, 2, 1, 10, 11, 2, 12, 13, 7), + gsSPNTriangles_5b(10, 14, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/data/npc/npc_1_get_pull_wait1.c b/src/data/npc/npc_1_get_pull_wait1.c new file mode 100644 index 00000000..9d376e50 --- /dev/null +++ b/src/data/npc/npc_1_get_pull_wait1.c @@ -0,0 +1,56 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" +#include "c_keyframe.h" +#include "ac_npc.h" + +u8 cKF_ckcb_r_npc_1_get_pull_wait1_tbl[] = { 56, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 7, 7, + 7, 0, 7, 7, 0, 7, 7, 7, 7, 0, 7, 0, 0 }; + +s16 cKF_kn_npc_1_get_pull_wait1_tbl[] = { 2, 3, 2, 2, 2, 2, 3, 3, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, + 2, 3, 2, 2, 3, 3, 2, 4, 2, 2, 4, 2, 2, 4, 4, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 4, 2, 2, 2 }; + +s16 cKF_c_npc_1_get_pull_wait1_tbl[] = { 0, 0, 900, 0, 0, 1800, 0, 0, 1800, 0, 900, 0, 0, 0, + -900, 0, 0, 900, 0, -900, 0, 0, 0, 0, 0, 0, -900 }; + +s16 cKF_ds_npc_1_get_pull_wait1_tbl[] = { + 1, 0, 0, 17, 0, 0, 1, 975, 0, 9, 950, 0, 17, 975, 0, 1, 0, 0, 17, 0, 0, + 1, 0, 0, 17, 0, 0, 1, 60, 0, 17, 60, 0, 1, 90, 0, 17, 90, 0, 1, -185, 0, + 9, -188, 0, 17, -185, 0, 1, 40, 0, 9, -71, 0, 17, 40, 0, 1, -85, 0, 9, -48, 0, + 17, -85, 0, 1, 0, 0, 17, 0, 0, 1, 40, 0, 9, 290, 0, 17, 40, 0, 1, 0, 0, + 17, 0, 0, 1, 0, 0, 9, 0, 0, 17, 0, 0, 1, -15, 0, 9, -146, 0, 17, -15, 0, + 1, 0, 0, 9, 3, 0, 17, 0, 0, 1, 180, 0, 9, 193, 0, 17, 180, 0, 1, -260, 0, + 9, -290, 0, 17, -260, 0, 1, -145, 0, 9, -159, 0, 17, -145, 0, 1, 0, 0, 17, 0, 0, + 1, 560, 0, 9, 626, 0, 17, 560, 0, 1, 0, 0, 17, 0, 0, 1, 0, 0, 17, 0, 0, + 1, -240, 0, 9, -274, 0, 17, -240, 0, 1, -40, 0, 9, -49, 0, 17, -40, 0, 1, 0, 0, + 17, 0, 0, 1, 60, 436, 5, 100, 0, 12, 20, 0, 17, 60, 436, 1, 0, 0, 17, 0, 0, + 1, 0, 0, 17, 0, 0, 1, 82, 466, 6, 140, 0, 13, 50, 0, 17, 82, 466, 1, 0, 0, + 17, 0, 0, 1, 0, 0, 17, 0, 0, 1, 100, 148, 5, 110, 0, 13, 90, 0, 17, 100, 148, + 1, -90, 149, 5, -80, 0, 13, -100, 0, 17, -90, 149, 1, 0, 0, 17, 0, 0, 1, -300, 0, + 17, -300, 0, 1, -500, 0, 17, -500, 0, 1, 0, 0, 17, 0, 0, 1, -600, 0, 17, -600, 0, + 1, 0, 0, 17, 0, 0, 1, 0, 0, 17, 0, 0, 1, -300, 0, 17, -300, 0, 1, 503, 0, + 17, 500, 0, 1, 0, 0, 17, 0, 0, 1, -600, 0, 17, -600, 0, 1, 0, 0, 17, 0, 0, + 1, 0, 0, 17, 0, 0, 1, 0, 0, 17, 0, 0, 1, 0, 0, 17, 0, 0, 1, 0, 0, + 17, 0, 0, 1, -200, 0, 17, -200, 0, 1, -10, -149, 5, -20, 0, 13, 0, 0, 17, -10, -149, + 1, 0, 0, 17, 0, 0, 1, 0, 0, 17, 0, 0, 1, 0, 0, 17, 0, 0 +}; + +aNPC_Animation_c cKF_ba_r_npc_1_get_pull_wait1 = { + { cKF_ckcb_r_npc_1_get_pull_wait1_tbl, cKF_ds_npc_1_get_pull_wait1_tbl, cKF_kn_npc_1_get_pull_wait1_tbl, + cKF_c_npc_1_get_pull_wait1_tbl, -1, 17 }, + 1.0f, + 17.0f, + cKF_FRAMECONTROL_REPEAT, + -5.0f, + NULL, + 1, + -1, + NULL, + 1, + 0, + -1, + -1, + NULL, + NULL, +}; diff --git a/tools/converters/assetdis.py b/tools/converters/assetdis.py index a2bea551..0c009e3a 100644 --- a/tools/converters/assetdis.py +++ b/tools/converters/assetdis.py @@ -1,3 +1,4 @@ +import pathlib from argparse import ArgumentParser from gfxdis import convert_binary_to_gfx from dataclasses import dataclass @@ -7,6 +8,145 @@ ASSET_ALIGN = "ATTRIBUTE_ALIGN(32)" NO_ALIGN = "" +def dict_enum_from_list(l: list): return {i: x for i, x, in enumerate(l)} + + +EFFECT_TYPES = dict_enum_from_list([ + "eEC_EFFECT_SHOCK", + "eEC_EFFECT_DUST", + "eEC_EFFECT_MUKA", + "eEC_EFFECT_WARAU", + "eEC_EFFECT_HA", + "eEC_EFFECT_SIBUKI", + "eEC_EFFECT_GIMONHU", + "eEC_EFFECT_KANTANHU", + "eEC_EFFECT_ASE", + "eEC_EFFECT_ASE_CH", + "eEC_EFFECT_KANGAERU", + "eEC_EFFECT_OTIKOMI", + "eEC_EFFECT_BURUBURU", + "eEC_EFFECT_SIAWASE_HIKARI", + "eEC_EFFECT_SIAWASE_HANA", + "eEC_EFFECT_SIAWASE_HANA_CH", + "eEC_EFFECT_TAKURAMI", + "eEC_EFFECT_TAKURAMI_KIRA", + "eEC_EFFECT_KAZE", + "eEC_EFFECT_KAZE_HAPPA", + "eEC_EFFECT_LOVELOVE", + "eEC_EFFECT_LOVELOVE_HEART", + "eEC_EFFECT_PUN", + "eEC_EFFECT_PUN_YUGE", + "eEC_EFFECT_PUN_SEKIMEN", + "eEC_EFFECT_NAKU", + "eEC_EFFECT_NAMIDA", + "eEC_EFFECT_HIRAMEKI_DEN", + "eEC_EFFECT_HIRAMEKI_HIKARI", + "eEC_EFFECT_SITUREN", + "eEC_EFFECT_ASE2", + "eEC_EFFECT_DASH_ASIMOTO", + "eEC_EFFECT_KONPU", + "eEC_EFFECT_LOVELOVE2", + "eEC_EFFECT_KPUN", + "eEC_EFFECT_KISHA_KEMURI", + "eEC_EFFECT_NEBOKE", + "eEC_EFFECT_NEBOKE_AWA", + "eEC_EFFECT_HANABI_YANAGI", + "eEC_EFFECT_HANABI_BOTAN1", + "eEC_EFFECT_HANABI_BOTAN2", + "eEC_EFFECT_HANABI_HOSHI", + "eEC_EFFECT_HANABI_SET", + "eEC_EFFECT_HANABI_SWITCH", + "eEC_EFFECT_FOOTPRINT", + "eEC_EFFECT_TURN_FOOTPRINT", + "eEC_EFFECT_BUBU", + "eEC_EFFECT_TURN_ASIMOTO", + "eEC_EFFECT_STRING", + "eEC_EFFECT_YUKIHANE", + "eEC_EFFECT_ANAHIKARI", + "eEC_EFFECT_BUSH_HAPPA", + "eEC_EFFECT_BUSH_YUKI", + "eEC_EFFECT_TUMBLE", + "eEC_EFFECT_TUMBLE_BODYPRINT", + "eEC_EFFECT_SLIP", + "eEC_EFFECT_TUMBLE_DUST", + "eEC_EFFECT_SWING_NET", + "eEC_EFFECT_AMI_MIZU", + "eEC_EFFECT_MIZUTAMA", + "eEC_EFFECT_YUKIDAMA", + "eEC_EFFECT_KIKUZU", + "eEC_EFFECT_SWING_AXE", + "eEC_EFFECT_STEAM", + "eEC_EFFECT_NIGHT15_MOON", + "eEC_EFFECT_NIGHT13_MOON", + "eEC_EFFECT_NEBOKE_AKUBI", + "eEC_EFFECT_SLIP_FOOTPRINT", + "eEC_EFFECT_WALK_ASIMOTO", + "eEC_EFFECT_TURI_HAMON", + "eEC_EFFECT_TURI_MIZU", + "eEC_EFFECT_TURI_HANE0", + "eEC_EFFECT_TURI_HANE1", + "eEC_EFFECT_TURI_SUITEKI", + "eEC_EFFECT_ONGEN", + "eEC_EFFECT_IMPACT_STAR", + "eEC_EFFECT_SANDSPLASH", + "eEC_EFFECT_YOUNG_TREE", + "eEC_EFFECT_SWING_ROD", + "eEC_EFFECT_DOYON", + "eEC_EFFECT_KAGU_HAPPA", + "eEC_EFFECT_HANABI_DUMMY", + "eEC_EFFECT_DIG_HOLE", + "eEC_EFFECT_DIG_SCOOP", + "eEC_EFFECT_DIG_MUD", + "eEC_EFFECT_KIGAE", + "eEC_EFFECT_KIGAE_LIGHT", + "eEC_EFFECT_TAPE", + "eEC_EFFECT_CLACKER", + "eEC_EFFECT_KAMIFUBUKI", + "eEC_EFFECT_CAR_BLIGHT", + "eEC_EFFECT_TAMAIRE", + "eEC_EFFECT_CAR_LIGHT", + "eEC_EFFECT_RESET_HOLE", + "eEC_EFFECT_GOKI", + "eEC_EFFECT_HANABIRA", + "eEC_EFFECT_WAIT_ASIMOTO", + "eEC_EFFECT_OTOSIANA", + "eEC_EFFECT_IKIGIRE", + "eEC_EFFECT_YUKIDARUMA", + "eEC_EFFECT_KYOUSOU_ONPU", + "eEC_EFFECT_DOUZOU_LIGHT", + "eEC_EFFECT_HALLOWEEN_SMOKE", + "eEC_EFFECT_HALLOWEEN", + "eEC_EFFECT_MOTIYUGE", + "eEC_EFFECT_TABERU", + "eEC_EFFECT_KASAMIZU", + "eEC_EFFECT_KASAMIZUTAMA", + "eEC_EFFECT_HANATIRI", + "eEC_EFFECT_URANAI", + "eEC_EFFECT_SUISOU_AWA", + "eEC_EFFECT_BREAK_AXE", + "eEC_EFFECT_YAJIRUSHI", + "eEC_EFFECT_SOBA_YUGE", + "eEC_EFFECT_FURO_YUGE", + "eEC_EFFECT_SHOOTING", + "eEC_EFFECT_SHOOTING_SET", + "eEC_EFFECT_SHOOTING_KIRA", + "eEC_EFFECT_COIN", + "eEC_EFFECT_TENT_LAMP", + "eEC_EFFECT_FLASH", + "eEC_EFFECT_FLASHC", + "eEC_EFFECT_KILLER", + "eEC_EFFECT_MAKE_HEM", + "eEC_EFFECT_MAKE_HEM_KIRA", + "eEC_EFFECT_MAKE_HEM_LIGHT", + "eEC_EFFECT_NUM" +]) + +FRAMECONTROL_MODE = dict_enum_from_list([ + "cKF_FRAMECONTROL_STOP", + "cKF_FRAMECONTROL_REPEAT", +]) + + @dataclass class struct_ref: symbol_name: str @@ -30,11 +170,11 @@ def anim_type_conv(anim_type: int): }.get(anim_type, str(anim_type)) -def parse_bin_formatted(buff: bytes, in_format: list[tuple[str, str]], _symbols: dict[int, str], val_conv: callable = None, type_conv: callable = None): +def parse_bin_formatted(buff: bytes, in_format: list[tuple[str, str]], _symbols: dict[int, str], val_conv: callable = None, type_conv: callable = None, fmt_conv: callable = None): struct_format = ">" symbols_offsets = {} symbol_order = [] - reloc_symbols = set() + reloc_symbols = [] for format_pair in in_format: if format_pair == None: @@ -45,7 +185,7 @@ def parse_bin_formatted(buff: bytes, in_format: list[tuple[str, str]], _symbols: struct_type, name = format_pair if struct_type == "p": - reloc_symbols.add(name) + reloc_symbols.append(name) struct_type = "xxxx" struct_format += struct_type @@ -90,6 +230,18 @@ def parse_bin_formatted(buff: bytes, in_format: list[tuple[str, str]], _symbols: if new_type != None: found_syms.append(struct_ref(value, new_type)) + new_converted_vals = {} + + if fmt_conv: + for name, val in collapsed_data.items(): + new_val = fmt_conv(name, val, dict(collapsed_data)) + if new_val != None: + new_converted_vals[name] = new_val + + collapsed_data.update(new_converted_vals) + + new_converted_vals = {} + vals = collapsed_data.values() out_c_data.append(f"\t{{ {', '.join([str(x) for x in vals])} }}") @@ -180,12 +332,61 @@ def parse_cKF_Animation_R_c(buff: bytes, symbols: list[str]): "fixed_table": "s16", }.get(name, None) - def vcf(name, value, symbols): - if name == "x": + return parse_bin_formatted(buff, this_format, symbols, type_conv=tcf) + + +def parse_aNPC_Animation_c(buff: bytes, symbols: list[str]): + this_format = [ + ("p", "flag_table"), + ("p", "data_table"), + ("p", "key_table"), + ("p", "fixed_table"), + ("h", "pad"), + ("h", "frames"), + ("f", "start_time"), + ("f", "end_time"), + ("l", "mode"), + ("f", "morph_counter"), + ("p", "eye_seq_p"), + ("h", "eye_seq_type"), + ("h", "eye_seq_stop_frame"), + ("p", "mouth_seq_p"), + ("h", "mouth_seq_type"), + ("h", "mouth_seq_stop_frame"), + ("h", "feel_effect_set_frame"), + ("h", "feel_effect_type"), + ("p", "feel_effect"), + ("p", "se_data_table")] + + def tcf(name, symbols): + return { + "flag_table": "u8", + "data_table": "s16", + "key_table": "s16", + "fixed_table": "s16", + "eye_seq_p": "u8", + "mouth_seq_p": "u8", + # "feel_effect": "aNPC_feel_effect_c", + # "se_data_table": "aNPC_se_data_table_c", + }.get(name, None) + + def fcf(name, value, symbols): + if name == "flag_table": return f"{{ {value}" - if name == "z": + if name == "frames": return f"{value} }}" - return parse_bin_formatted(buff, this_format, symbols, vcf, tcf) + if name == "se_data_table": + return f"{value}," + if name in ["start_time", "end_time", "morph_counter"]: + return f"{value}f" + + def vcf(name, value, symbols): + if name == "feel_effect_type": + return EFFECT_TYPES.get(value, str(value)) + if name == "mode": + return FRAMECONTROL_MODE.get(value, str(value)) + + return parse_bin_formatted(buff, this_format, symbols, vcf, tcf, fcf) def parse_cKF_Joint_R_c(buff: bytes, symbols: list[str]): @@ -197,17 +398,19 @@ def parse_cKF_Joint_R_c(buff: bytes, symbols: list[str]): "joint_table": "Gfx", }.get(name, None) - def vcf(name, value, symbols): + def fcf(name, value, symbols): if name == "x": return f"{{ {value}" if name == "z": return f"{value} }}" + + def vcf(name, value, symbols): if name == "flags": return { 0: "cKF_JOINT_FLAG_DISP_OPA", 1: "cKF_JOINT_FLAG_DISP_XLU" }.get(value, None) - return parse_bin_formatted(buff, this_format, symbols, vcf, tcf) + return parse_bin_formatted(buff, this_format, symbols, vcf, tcf, fcf) def parse_u16(buff: bytes, symbols: list[str]): @@ -228,6 +431,30 @@ def parse_u8(buff: bytes, symbols: list[str]): return struct_parse_result(out_str, []) +def lookup_rel_vtx_offset(lines: list[str], name: str): + symbol_name, offset_label = name.split(", ") + offset = 0 + inside = False + for line in lines: + if line.startswith(f".obj {symbol_name}"): + inside = True + if not inside: + continue + + if line.startswith(offset_label): + return offset + + if ".4byte" in line: + offset += 4 + elif ".2byte" in line: + offset += 2 + elif ".byte" in line: + offset += line.count(",") + 1 + else: + assert (not line.endswith(f".endobj {symbol_name}")) + assert (False) + + def lookup_bins_and_symbols(lines: list[str], name: str): out_bin = bytearray() out_symbols = [] @@ -250,7 +477,10 @@ def lookup_bins_and_symbols(lines: list[str], name: str): out_symbols.append(data) elif ".rel" in line: out_bin.extend(b'\0\0\0\0') - out_symbols.append(f"&{line.split(".rel ")[1].split(",")[0]}[0]") + rel_plus_offset = line.split(".rel ")[1] + vtx_offset = lookup_rel_vtx_offset(lines, rel_plus_offset) + out_symbols.append( + f"&{rel_plus_offset.split(", ")[0]}[{vtx_offset//0x10}]") elif ".byte" in line: data = line.split(".byte ")[1] out_bin.extend(int(data, 16).to_bytes(1, 'big')) @@ -258,14 +488,19 @@ def lookup_bins_and_symbols(lines: list[str], name: str): return out_bin, out_symbols -def lookup_static(lines: list[str], name: str): - lookfor = f".obj {name}" +def is_static(lines: list[str], name: str): + lookfor = f".obj {name}," for line in lines: if line.startswith(lookfor): - if line.startswith(lookfor + ", local"): - return "static " - else: - return "" + if line.startswith(lookfor + " local"): + return True + break + return False + + +def lookup_static(lines: list[str], name: str): + if is_static(lines, name): + return "static " return "" @@ -314,12 +549,23 @@ def lookup_bins_and_symbols2(lines: list[str], name: str): return out_bin, out_symbols +def lookup_address(lines: list[str], name: str): + for i, line in enumerate(lines): + if line.startswith(f".obj {name},"): + addr = lines[i-1].split(" | ")[1] + return addr + assert (False) + + def convert_source_to_gfx_c_source(src_file, dest_path): with open(src_file) as f: lines = f.read().split("\n") + src_file_name = pathlib.Path(src_file).stem + config_change_path = str( + pathlib.PurePosixPath(dest_path).relative_to("src")) includes = ["libforest/gbi_extensions.h", - "PR/gbi.h", "evw_anime.h", "c_keyframe.h"] + "PR/gbi.h", "evw_anime.h", "c_keyframe.h", "ac_npc.h"] header = "\n".join([f'#include "{x}"' for x in includes]) + "\n" @@ -345,6 +591,8 @@ def convert_source_to_gfx_c_source(src_file, dest_path): found_types.append((this_obj, "TEX")) elif this_obj.startswith("cKF_bs_r"): found_types.append((this_obj, "cKF_Skeleton_R_c")) + elif this_obj.startswith("cKF_ba_r_npc"): + found_types.append((this_obj, "aNPC_Animation_c")) elif this_obj.startswith("cKF_ba_r"): found_types.append((this_obj, "cKF_Animation_R_c")) @@ -369,25 +617,29 @@ def convert_source_to_gfx_c_source(src_file, dest_path): "u8": parse_u8, "u16": parse_u16, "s16": parse_s16, + "aNPC_Animation_c": parse_aNPC_Animation_c, + # "aNPC_feel_effect_c": parse_aNPC_Animation_c, + # "aNPC_se_data_table_c": parse_aNPC_Animation_c, } # we now have a list of objects+type while len(found_types) > 0: obj_name, type = found_types.pop() + default_data = f'#include "assets/{obj_name}.inc"' + if is_static(lines, obj_name): + default_data = f'#include "assets/{src_file_name}/{obj_name}.inc"' + if obj_name in converted_types: continue if type == "Vtx": - data = f'#include "assets/{obj_name}.inc"' - converted_types[obj_name] = (type, data, NO_ALIGN) + converted_types[obj_name] = (type, default_data, NO_ALIGN) elif type == "Gfx": data = convert_binary_to_gfx( *lookup_bins_and_symbols(lines, obj_name)) converted_types[obj_name] = (type, data + ",", NO_ALIGN) elif type == "PAL": - data = f'#include "assets/{obj_name}.inc"' - converted_types[obj_name] = ("u16", data, ASSET_ALIGN) + converted_types[obj_name] = ("u16", default_data, ASSET_ALIGN) elif type == "TEX": - data = f'#include "assets/{obj_name}.inc"' - converted_types[obj_name] = ("u8", data, ASSET_ALIGN) + converted_types[obj_name] = ("u8", default_data, ASSET_ALIGN) elif type in lookup_table: res: struct_parse_result = lookup_table[type]( @@ -398,27 +650,85 @@ def convert_source_to_gfx_c_source(src_file, dest_path): found_types = [(ref.symbol_name, ref.symbol_type) for ref in res.referenced_objects] + found_types - out = header + "\n\n" + out = header + "\n" for obj in all_objs: + default_include = f'#include "assets/{obj}.inc"' + if is_static(lines, obj): + default_include = f'#include "assets/{src_file_name}/{obj}.inc"' + this_type, out_data, align = converted_types.get( - obj, ("u8", f'#include "assets/{obj}.inc"', NO_ALIGN)) + obj, ("u8", default_include, NO_ALIGN)) static_typing = lookup_static(lines, obj) - out += f"{static_typing}{this_type} {obj}[] {align}= {{ \n{out_data}\n}};\n\n" - # print(out) + if this_type in ["aNPC_Animation_c", "cKF_Animation_R_c", "cKF_Skeleton_R_c"]: + out += f"{static_typing}{this_type} {obj} {align}= \n{out_data}\n;\n\n" + else: + out += f"{static_typing}{this_type} {obj}[] {align}= {{\n{out_data}\n}};\n\n" + with open(dest_path, "w") as f: f.write(out) + # print(out) + config_py = "configure.py" + with open(config_py, "r") as f: + config_txt = f.read() + + config_txt = config_txt.replace(f"Object(NonMatching, \"{config_change_path}\"),", + f"Object(Matching, \"{config_change_path}\"),") + with open(config_py, "w") as f: + f.write(config_txt) + + config_yaml = "config/GAFE01_00/config.yml" + with open(config_yaml, "a") as f: + for i, line in enumerate(out.split("\n")): + if line.startswith("#include \"assets"): + prev_line = out.split("\n")[i-1] + parts = prev_line.split("=")[0].split(" ") + type = parts[0] + name = parts[1] + im_static = False + if type == "static": + im_static = True + type = parts[1] + name = parts[2] + name = name[:-2] # cut off the array [] + if im_static: + out_config = f""" + - symbol: {name}!.data:{lookup_address(lines, name)} + binary: assets/{src_file_name}/{name}.bin + header: assets/{src_file_name}/{name}.inc +""" + else: + out_config = f""" + - symbol: {name} + binary: assets/{name}.bin + header: assets/{name}.inc +""" + if type == "u8": + out_config += " header_type: raw\n" + elif type == "Vtx": + out_config += " header_type: none\n custom_type: vtx\n" + elif type == "u16": + out_config += " header_type: none\n custom_type: pal16\n" + else: + assert (False) + f.write(out_config) + def main(): parser = ArgumentParser( description="Converts a binary file into gfx calls" ) parser.add_argument("src_path", type=str, help="Binary source file path") - parser.add_argument("dest_path", type=str, - help="Destination C include file path") args = parser.parse_args() - convert_source_to_gfx_c_source(args.src_path, args.dest_path) + + presented_path = args.src_path + + src_path = str(pathlib.PurePosixPath( + "./build/GAFE01_00/foresta/asm/") / (presented_path[:-2] + ".s")) + dest_path = str(pathlib.PurePosixPath("src") / presented_path) + print(dest_path) + convert_source_to_gfx_c_source(src_path, dest_path) if __name__ == "__main__":