diff options
author | Oliver Kiehl | 2003-04-27 21:40:17 +0000 |
---|---|---|
committer | Oliver Kiehl | 2003-04-27 21:40:17 +0000 |
commit | 687bcd0c09d0e8aef037c6682aa337567e703b73 (patch) | |
tree | 84d939209b2c729adaea56e5f810c76a1c430ac8 /sky/compacts | |
parent | 30ac620bd3d26304f109bdb7190cc8c120716df4 (diff) | |
download | scummvm-rg350-687bcd0c09d0e8aef037c6682aa337567e703b73.tar.gz scummvm-rg350-687bcd0c09d0e8aef037c6682aa337567e703b73.tar.bz2 scummvm-rg350-687bcd0c09d0e8aef037c6682aa337567e703b73.zip |
Found out what the UnknownStuff is and restructured accordingly
svn-id: r7164
Diffstat (limited to 'sky/compacts')
-rw-r--r-- | sky/compacts/0compact.h | 72 | ||||
-rw-r--r-- | sky/compacts/13comp.h | 36 | ||||
-rw-r--r-- | sky/compacts/14comp.h | 36 | ||||
-rw-r--r-- | sky/compacts/27comp.h | 36 | ||||
-rw-r--r-- | sky/compacts/2compact.h | 258 | ||||
-rw-r--r-- | sky/compacts/36comp.h | 36 | ||||
-rw-r--r-- | sky/compacts/38comp.h | 174 | ||||
-rw-r--r-- | sky/compacts/3compact.h | 42 | ||||
-rw-r--r-- | sky/compacts/71comp.h | 36 | ||||
-rw-r--r-- | sky/compacts/72comp.h | 36 | ||||
-rw-r--r-- | sky/compacts/73comp.h | 36 | ||||
-rw-r--r-- | sky/compacts/76comp.h | 36 | ||||
-rw-r--r-- | sky/compacts/z_compac.h | 536 |
13 files changed, 778 insertions, 592 deletions
diff --git a/sky/compacts/0compact.h b/sky/compacts/0compact.h index b30649d3cc..f8f50dba7a 100644 --- a/sky/compacts/0compact.h +++ b/sky/compacts/0compact.h @@ -4066,8 +4066,8 @@ uint16 m_ss_r_to_l[] = { 0, }; -uint16 *mini_so_turnTable[5][5] = { - { // turnTableup +uint16 *mini_so_turnTable0[5][5] = { + { // turnTableUp 0, m_ss_u_to_d, m_ss_u_to_l, @@ -4104,6 +4104,23 @@ uint16 *mini_so_turnTable[5][5] = { }, }; +MegaSet mini_so_megaSet0 = { + 0, // gridWidth + 0, // colOffset + 8, // colWidth + 8, // lastChr + m_ss_up, // animUp + m_ss_down, // animDown + m_ss_left, // animLeft + m_ss_right, // animRight + m_ss_st_up, // standUp + m_ss_st_down, // standDown + m_ss_st_left, // standLeft + m_ss_st_right, // standRight + m_ss_st_talk, // standTalk + mini_so_turnTable0, +}; + ExtCompact mini_so_ext = { 0, // actionSub 0, // actionSub_off @@ -4130,19 +4147,7 @@ ExtCompact mini_so_ext = { 0, // arTarget_y ss_auto, // animScratch 0, // megaSet - 0, // gridWidth - 0, // colOffset - 8, // colWidth - 8, // lastChr - m_ss_up, // animUp - m_ss_down, // animDown - m_ss_left, // animLeft - m_ss_right, // animRight - m_ss_st_up, // standUp - m_ss_st_down, // standDown - m_ss_st_left, // standLeft - m_ss_st_right, // standRight - m_ss_st_talk, // standTalk + &mini_so_megaSet0, }; Compact mini_so = { @@ -4175,7 +4180,6 @@ Compact mini_so = { START_MINI_SS, // baseSub 0, // baseSub_off &mini_so_ext, - &mini_so_turnTable, }; uint16 unload_seq1[] = { @@ -4586,8 +4590,8 @@ uint16 f_ss_r_to_l[] = { 0, }; -uint16 *full_so_turnTable[5][5] = { - { // turnTableup +uint16 *full_so_turnTable0[5][5] = { + { // turnTableUp 0, f_ss_u_to_d, f_ss_u_to_l, @@ -4624,6 +4628,23 @@ uint16 *full_so_turnTable[5][5] = { }, }; +MegaSet full_so_megaSet0 = { + 3, // gridWidth + 8, // colOffset + 16, // colWidth + 24, // lastChr + f_ss_up, // animUp + f_ss_down, // animDown + f_ss_left, // animLeft + f_ss_right, // animRight + f_ss_st_up, // standUp + f_ss_st_down, // standDown + f_ss_st_left, // standLeft + f_ss_st_right, // standRight + 0, // standTalk + full_so_turnTable0, +}; + ExtCompact full_so_ext = { 0, // actionSub 0, // actionSub_off @@ -4650,19 +4671,7 @@ ExtCompact full_so_ext = { 0, // arTarget_y full_ss_auto, // animScratch 0, // megaSet - 3, // gridWidth - 8, // colOffset - 16, // colWidth - 24, // lastChr - f_ss_up, // animUp - f_ss_down, // animDown - f_ss_left, // animLeft - f_ss_right, // animRight - f_ss_st_up, // standUp - f_ss_st_down, // standDown - f_ss_st_left, // standLeft - f_ss_st_right, // standRight - 0, // standTalk + &full_so_megaSet0, }; Compact full_so = { @@ -4695,7 +4704,6 @@ Compact full_so = { FULL_SS_CUT, // baseSub 0, // baseSub_off &full_so_ext, - &full_so_turnTable, }; uint16 panel_seq[] = { diff --git a/sky/compacts/13comp.h b/sky/compacts/13comp.h index c9d1a1e8db..9886d9ae35 100644 --- a/sky/compacts/13comp.h +++ b/sky/compacts/13comp.h @@ -2367,8 +2367,8 @@ uint16 foreman_r_to_d[] = { 0, }; -uint16 *foreman_turnTable[5][5] = { - { // turnTableup +uint16 *foreman_turnTable0[5][5] = { + { // turnTableUp 0, foreman_u_to_d, foreman_u_to_l, @@ -2405,6 +2405,23 @@ uint16 *foreman_turnTable[5][5] = { }, }; +MegaSet foreman_megaSet0 = { + 3, // gridWidth + 8, // colOffset + 16, // colWidth + 24, // lastChr + foreman_up, // animUp + foreman_down, // animDown + foreman_left, // animLeft + foreman_right, // animRight + foreman_st_up, // standUp + foreman_st_down, // standDown + foreman_st_left, // standLeft + foreman_st_right, // standRight + foreman_st_talk, // standTalk + foreman_turnTable0, +}; + ExtCompact foreman_ext = { 0, // actionSub 0, // actionSub_off @@ -2431,19 +2448,7 @@ ExtCompact foreman_ext = { 0, // arTarget_y foreman_auto, // animScratch 0, // megaSet - 3, // gridWidth - 8, // colOffset - 16, // colWidth - 24, // lastChr - foreman_up, // animUp - foreman_down, // animDown - foreman_left, // animLeft - foreman_right, // animRight - foreman_st_up, // standUp - foreman_st_down, // standDown - foreman_st_left, // standLeft - foreman_st_right, // standRight - foreman_st_talk, // standTalk + &foreman_megaSet0, }; Compact foreman = { @@ -2476,7 +2481,6 @@ Compact foreman = { FOREMAN_LOGIC, // baseSub 0, // baseSub_off &foreman_ext, - &foreman_turnTable, }; uint16 lite1_seq[] = { diff --git a/sky/compacts/14comp.h b/sky/compacts/14comp.h index 6b12455d13..6072c7d5be 100644 --- a/sky/compacts/14comp.h +++ b/sky/compacts/14comp.h @@ -337,8 +337,8 @@ uint16 radman_r_to_l[] = { 0, }; -uint16 *radman_turnTable[5][5] = { - { // turnTableup +uint16 *radman_turnTable0[5][5] = { + { // turnTableUp 0, radman_u_to_d, radman_u_to_l, @@ -375,6 +375,23 @@ uint16 *radman_turnTable[5][5] = { }, }; +MegaSet radman_megaSet0 = { + 3, // gridWidth + 8, // colOffset + 16, // colWidth + 24, // lastChr + radman_up, // animUp + radman_down, // animDown + radman_left, // animLeft + radman_right, // animRight + radman_st_up, // standUp + radman_st_down, // standDown + radman_st_left, // standLeft + radman_st_right, // standRight + radman_st_talk, // standTalk + radman_turnTable0, +}; + ExtCompact radman_ext = { 0, // actionSub 0, // actionSub_off @@ -401,19 +418,7 @@ ExtCompact radman_ext = { 0, // arTarget_y radman_auto, // animScratch 0, // megaSet - 3, // gridWidth - 8, // colOffset - 16, // colWidth - 24, // lastChr - radman_up, // animUp - radman_down, // animDown - radman_left, // animLeft - radman_right, // animRight - radman_st_up, // standUp - radman_st_down, // standDown - radman_st_left, // standLeft - radman_st_right, // standRight - radman_st_talk, // standTalk + &radman_megaSet0, }; Compact radman = { @@ -446,7 +451,6 @@ Compact radman = { RADMAN_LOGIC, // baseSub 0, // baseSub_off &radman_ext, - &radman_turnTable, }; Compact locker2 = { diff --git a/sky/compacts/27comp.h b/sky/compacts/27comp.h index 999a442039..0bc4cbf42b 100644 --- a/sky/compacts/27comp.h +++ b/sky/compacts/27comp.h @@ -2039,8 +2039,8 @@ uint16 burke_d_to_r[] = { 0, }; -uint16 *burke_turnTable[5][5] = { - { // turnTableup +uint16 *burke_turnTable0[5][5] = { + { // turnTableUp 0, burke_u_to_d, burke_u_to_l, @@ -2077,6 +2077,23 @@ uint16 *burke_turnTable[5][5] = { }, }; +MegaSet burke_megaSet0 = { + 3, // gridWidth + 8, // colOffset + 16, // colWidth + 24, // lastChr + burke_up, // animUp + burke_down, // animDown + burke_left, // animLeft + burke_right, // animRight + burke_st_up, // standUp + burke_st_down, // standDown + burke_st_left, // standLeft + burke_st_right, // standRight + burke_st_talk, // standTalk + burke_turnTable0, +}; + ExtCompact burke_ext = { 0, // actionSub 0, // actionSub_off @@ -2103,19 +2120,7 @@ ExtCompact burke_ext = { 0, // arTarget_y burke_auto, // animScratch 0, // megaSet - 3, // gridWidth - 8, // colOffset - 16, // colWidth - 24, // lastChr - burke_up, // animUp - burke_down, // animDown - burke_left, // animLeft - burke_right, // animRight - burke_st_up, // standUp - burke_st_down, // standDown - burke_st_left, // standLeft - burke_st_right, // standRight - burke_st_talk, // standTalk + &burke_megaSet0, }; Compact burke = { @@ -2148,7 +2153,6 @@ Compact burke = { BURKE_LOGIC, // baseSub 0, // baseSub_off &burke_ext, - &burke_turnTable, }; uint16 shake_seq[] = { diff --git a/sky/compacts/2compact.h b/sky/compacts/2compact.h index eb51c3dc0b..f8ca7d7bc5 100644 --- a/sky/compacts/2compact.h +++ b/sky/compacts/2compact.h @@ -1259,127 +1259,112 @@ uint16 sml_loaderb_l_to_d[] = { 0, }; -UnknownStuff loader_unk = { - { // unknownStuff_1_1 - 3, - 8, - 16, - 24 +uint16 *loader_turnTable0[5][5] = { + { // turnTableUp + 0, + loader_u_to_d, + loader_u_to_l, + loader_u_to_r, + 0 + }, + { // turnTableDown + loader_d_to_u, + 0, + loader_d_to_l, + loader_d_to_r, + 0 + }, + { // turnTableLeft + loader_l_to_u, + loader_l_to_d, + 0, + loader_l_to_r, + 0 + }, + { // turnTableRight + loader_r_to_u, + loader_r_to_d, + loader_r_to_l, + 0, + 0 }, - { // unknownStuff_1_2 - loaderb_up, - loaderb_down, - loaderb_left, - loaderb_right, - loaderb_st_up, - loaderb_st_down, - loaderb_st_left, - loaderb_st_right, + { // turnTableTalk + 0, + 0, + 0, 0, + 0 + }, +}; + +uint16 *loader_turnTable1[5][5] = { + { // turnTableUp 0, loaderb_u_to_d, loaderb_u_to_l, loaderb_u_to_r, - 0, + 0 + }, + { // turnTableDown loaderb_d_to_u, 0, loaderb_d_to_l, loaderb_d_to_r, - 0, + 0 + }, + { // turnTableLeft loaderb_l_to_u, loaderb_l_to_d, 0, loaderb_l_to_r, - 0, + 0 + }, + { // turnTableRight loaderb_r_to_u, loaderb_r_to_d, loaderb_r_to_l, 0, - 0, + 0 + }, + { // turnTableTalk 0, 0, 0, 0, 0 }, - { // unknownStuff_2_1 - 0, - 0, - 8, - 8 - }, - { // unknownStuff_2_2 - sml_loader_up, - sml_loader_down, - sml_loader_left, - sml_loader_right, - sml_loader_st_up, - sml_loader_st_down, - sml_loader_st_left, - sml_loader_st_right, - 0, +}; + +uint16 *loader_turnTable2[5][5] = { + { // turnTableUp 0, sml_loader_u_to_d, sml_loader_u_to_l, sml_loader_u_to_r, - 0, + 0 + }, + { // turnTableDown sml_loader_d_to_u, 0, sml_loader_d_to_l, sml_loader_d_to_r, - 0, + 0 + }, + { // turnTableLeft sml_loader_l_to_u, sml_loader_l_to_d, 0, sml_loader_l_to_r, - 0, + 0 + }, + { // turnTableRight sml_loader_r_to_u, sml_loader_r_to_d, sml_loader_r_to_l, 0, - 0, - 0, - 0, - 0, - 0, 0 }, - { // unknownStuff_3_1 - 0, - 0, - 8, - 8 - }, - { // unknownStuff_3_2 - sml_loaderb_up, - sml_loaderb_down, - sml_loaderb_left, - sml_loaderb_right, - sml_loaderb_st_up, - sml_loaderb_st_down, - sml_loaderb_st_left, - sml_loaderb_st_right, - 0, - 0, - sml_loaderb_u_to_d, - sml_loaderb_u_to_l, - sml_loaderb_u_to_r, - 0, - sml_loaderb_d_to_u, - 0, - sml_loaderb_d_to_l, - sml_loaderb_d_to_r, - 0, - sml_loaderb_l_to_u, - sml_loaderb_l_to_d, - 0, - sml_loaderb_l_to_r, - 0, - sml_loaderb_r_to_u, - sml_loaderb_r_to_d, - sml_loaderb_r_to_l, - 0, - 0, + { // turnTableTalk 0, 0, 0, @@ -1388,32 +1373,32 @@ UnknownStuff loader_unk = { }, }; -uint16 *loader_turnTable[5][5] = { - { // turnTableup +uint16 *loader_turnTable3[5][5] = { + { // turnTableUp 0, - loader_u_to_d, - loader_u_to_l, - loader_u_to_r, + sml_loaderb_u_to_d, + sml_loaderb_u_to_l, + sml_loaderb_u_to_r, 0 }, { // turnTableDown - loader_d_to_u, + sml_loaderb_d_to_u, 0, - loader_d_to_l, - loader_d_to_r, + sml_loaderb_d_to_l, + sml_loaderb_d_to_r, 0 }, { // turnTableLeft - loader_l_to_u, - loader_l_to_d, + sml_loaderb_l_to_u, + sml_loaderb_l_to_d, 0, - loader_l_to_r, + sml_loaderb_l_to_r, 0 }, { // turnTableRight - loader_r_to_u, - loader_r_to_d, - loader_r_to_l, + sml_loaderb_r_to_u, + sml_loaderb_r_to_d, + sml_loaderb_r_to_l, 0, 0 }, @@ -1426,6 +1411,74 @@ uint16 *loader_turnTable[5][5] = { }, }; +MegaSet loader_megaSet0 = { + 3, // gridWidth + 8, // colOffset + 16, // colWidth + 24, // lastChr + loader_up, // animUp + loader_down, // animDown + loader_left, // animLeft + loader_right, // animRight + loader_st_up, // standUp + loader_st_down, // standDown + loader_st_left, // standLeft + loader_st_right, // standRight + 0, // standTalk + loader_turnTable0, +}; + +MegaSet loader_megaSet1 = { + 3, // gridWidth + 8, // colOffset + 16, // colWidth + 24, // lastChr + loaderb_up, // animUp + loaderb_down, // animDown + loaderb_left, // animLeft + loaderb_right, // animRight + loaderb_st_up, // standUp + loaderb_st_down, // standDown + loaderb_st_left, // standLeft + loaderb_st_right, // standRight + 0, // standTalk + loader_turnTable1, +}; + +MegaSet loader_megaSet2 = { + 0, // gridWidth + 0, // colOffset + 8, // colWidth + 8, // lastChr + sml_loader_up, // animUp + sml_loader_down, // animDown + sml_loader_left, // animLeft + sml_loader_right, // animRight + sml_loader_st_up, // standUp + sml_loader_st_down, // standDown + sml_loader_st_left, // standLeft + sml_loader_st_right, // standRight + 0, // standTalk + loader_turnTable2, +}; + +MegaSet loader_megaSet3 = { + 0, // gridWidth + 0, // colOffset + 8, // colWidth + 8, // lastChr + sml_loaderb_up, // animUp + sml_loaderb_down, // animDown + sml_loaderb_left, // animLeft + sml_loaderb_right, // animRight + sml_loaderb_st_up, // standUp + sml_loaderb_st_down, // standDown + sml_loaderb_st_left, // standLeft + sml_loaderb_st_right, // standRight + 0, // standTalk + loader_turnTable3, +}; + ExtCompact loader_ext = { 0, // actionSub 0, // actionSub_off @@ -1452,19 +1505,10 @@ ExtCompact loader_ext = { 0, // arTarget_y loader_auto, // animScratch 0*NEXT_MEGA_SET, // megaSet - 3, // gridWidth - 8, // colOffset - 16, // colWidth - 24, // lastChr - loader_up, // animUp - loader_down, // animDown - loader_left, // animLeft - loader_right, // animRight - loader_st_up, // standUp - loader_st_down, // standDown - loader_st_left, // standLeft - loader_st_right, // standRight - 0, // standTalk + &loader_megaSet0, + &loader_megaSet1, + &loader_megaSet2, + &loader_megaSet3, }; Compact loader = { @@ -1497,8 +1541,6 @@ Compact loader = { LOADER_START, // baseSub 0, // baseSub_off &loader_ext, - &loader_turnTable, - &loader_unk, }; Compact junk2 = { diff --git a/sky/compacts/36comp.h b/sky/compacts/36comp.h index 7ff74ad918..9d6210fb9d 100644 --- a/sky/compacts/36comp.h +++ b/sky/compacts/36comp.h @@ -1274,8 +1274,8 @@ uint16 babs_t_to_r[] = { 0, }; -uint16 *sc36_babs_turnTable[5][5] = { - { // turnTableup +uint16 *sc36_babs_turnTable0[5][5] = { + { // turnTableUp 0, babs_u_to_d, babs_u_to_l, @@ -1312,6 +1312,23 @@ uint16 *sc36_babs_turnTable[5][5] = { }, }; +MegaSet sc36_babs_megaSet0 = { + 3, // gridWidth + 8, // colOffset + 16, // colWidth + 24, // lastChr + babs_up, // animUp + babs_down, // animDown + babs_left, // animLeft + babs_right, // animRight + babs_st_up, // standUp + babs_st_down, // standDown + babs_st_left, // standLeft + babs_st_right, // standRight + babs_st_talk, // standTalk + sc36_babs_turnTable0, +}; + ExtCompact sc36_babs_ext = { 0, // actionSub 0, // actionSub_off @@ -1338,19 +1355,7 @@ ExtCompact sc36_babs_ext = { 0, // arTarget_y babs_auto, // animScratch 0, // megaSet - 3, // gridWidth - 8, // colOffset - 16, // colWidth - 24, // lastChr - babs_up, // animUp - babs_down, // animDown - babs_left, // animLeft - babs_right, // animRight - babs_st_up, // standUp - babs_st_down, // standDown - babs_st_left, // standLeft - babs_st_right, // standRight - babs_st_talk, // standTalk + &sc36_babs_megaSet0, }; Compact sc36_babs = { @@ -1383,7 +1388,6 @@ Compact sc36_babs = { SC36_BABS_LOGIC, // baseSub 0, // baseSub_off &sc36_babs_ext, - &sc36_babs_turnTable, }; uint16 sc36_col_down4[] = { diff --git a/sky/compacts/38comp.h b/sky/compacts/38comp.h index 8802bfd656..1fd7dc8851 100644 --- a/sky/compacts/38comp.h +++ b/sky/compacts/38comp.h @@ -3172,53 +3172,8 @@ uint16 sex_u_to_l[] = { 0, }; -UnknownStuff danielle_unk = { - { // unknownStuff_1_1 - 3, - 8, - 16, - 24 - }, - { // unknownStuff_1_2 - sex_up, - sex_down, - sex_left, - sex_right, - sex_st_up, - sex_st_down, - sex_st_left, - sex_st_right, - sex_st_talk, - 0, - sex_u_to_d, - sex_u_to_l, - sex_u_to_r, - sex_u_to_t, - sex_d_to_u, - 0, - sex_d_to_l, - sex_d_to_r, - 0, - sex_l_to_u, - sex_l_to_d, - 0, - sex_l_to_r, - 0, - sex_r_to_u, - sex_r_to_d, - sex_r_to_l, - 0, - sex_r_to_t, - sex_t_to_u, - 0, - 0, - sex_t_to_r, - 0 - }, -}; - -uint16 *danielle_turnTable[5][5] = { - { // turnTableup +uint16 *danielle_turnTable0[5][5] = { + { // turnTableUp 0, dan_u_to_d, dan_u_to_l, @@ -3255,6 +3210,78 @@ uint16 *danielle_turnTable[5][5] = { }, }; +uint16 *danielle_turnTable1[5][5] = { + { // turnTableUp + 0, + sex_u_to_d, + sex_u_to_l, + sex_u_to_r, + sex_u_to_t + }, + { // turnTableDown + sex_d_to_u, + 0, + sex_d_to_l, + sex_d_to_r, + 0 + }, + { // turnTableLeft + sex_l_to_u, + sex_l_to_d, + 0, + sex_l_to_r, + 0 + }, + { // turnTableRight + sex_r_to_u, + sex_r_to_d, + sex_r_to_l, + 0, + sex_r_to_t + }, + { // turnTableTalk + sex_t_to_u, + 0, + 0, + sex_t_to_r, + 0 + }, +}; + +MegaSet danielle_megaSet0 = { + 3, // gridWidth + 8, // colOffset + 16, // colWidth + 24, // lastChr + dan_up, // animUp + dan_down, // animDown + dan_left, // animLeft + dan_right, // animRight + dan_st_up, // standUp + dan_st_down, // standDown + dan_st_left, // standLeft + dan_st_right, // standRight + dan_st_talk, // standTalk + danielle_turnTable0, +}; + +MegaSet danielle_megaSet1 = { + 3, // gridWidth + 8, // colOffset + 16, // colWidth + 24, // lastChr + sex_up, // animUp + sex_down, // animDown + sex_left, // animLeft + sex_right, // animRight + sex_st_up, // standUp + sex_st_down, // standDown + sex_st_left, // standLeft + sex_st_right, // standRight + sex_st_talk, // standTalk + danielle_turnTable1, +}; + ExtCompact danielle_ext = { 0, // actionSub 0, // actionSub_off @@ -3281,19 +3308,8 @@ ExtCompact danielle_ext = { 0, // arTarget_y dan_auto, // animScratch 0, // megaSet - 3, // gridWidth - 8, // colOffset - 16, // colWidth - 24, // lastChr - dan_up, // animUp - dan_down, // animDown - dan_left, // animLeft - dan_right, // animRight - dan_st_up, // standUp - dan_st_down, // standDown - dan_st_left, // standLeft - dan_st_right, // standRight - dan_st_talk, // standTalk + &danielle_megaSet0, + &danielle_megaSet1, }; Compact danielle = { @@ -3326,8 +3342,6 @@ Compact danielle = { DANIELLE_LOGIC, // baseSub 0, // baseSub_off &danielle_ext, - &danielle_turnTable, - &danielle_unk, }; uint16 spu_d_to_r[] = { @@ -3379,8 +3393,8 @@ uint16 spu_st_up[] = { 0, }; -uint16 *spunky_turnTable[5][5] = { - { // turnTableup +uint16 *spunky_turnTable0[5][5] = { + { // turnTableUp 0, spu_u_to_d, spu_u_to_l, @@ -3417,6 +3431,23 @@ uint16 *spunky_turnTable[5][5] = { }, }; +MegaSet spunky_megaSet0 = { + 3, // gridWidth + 8, // colOffset + 16, // colWidth + 24, // lastChr + spu_up, // animUp + spu_down, // animDown + spu_left, // animLeft + spu_right, // animRight + spu_st_up, // standUp + spu_st_down, // standDown + spu_st_left, // standLeft + spu_st_right, // standRight + spu_st_talk, // standTalk + spunky_turnTable0, +}; + ExtCompact spunky_ext = { 0, // actionSub 0, // actionSub_off @@ -3443,19 +3474,7 @@ ExtCompact spunky_ext = { 0, // arTarget_y spu_auto, // animScratch 0, // megaSet - 3, // gridWidth - 8, // colOffset - 16, // colWidth - 24, // lastChr - spu_up, // animUp - spu_down, // animDown - spu_left, // animLeft - spu_right, // animRight - spu_st_up, // standUp - spu_st_down, // standDown - spu_st_left, // standLeft - spu_st_right, // standRight - spu_st_talk, // standTalk + &spunky_megaSet0, }; Compact spunky = { @@ -3488,7 +3507,6 @@ Compact spunky = { SPUNKY_LOGIC, // baseSub 0, // baseSub_off &spunky_ext, - &spunky_turnTable, }; uint16 sc38_video_anim[] = { diff --git a/sky/compacts/3compact.h b/sky/compacts/3compact.h index 3169acd00a..cd45d0b17a 100644 --- a/sky/compacts/3compact.h +++ b/sky/compacts/3compact.h @@ -701,6 +701,10 @@ uint16 shades_d_to_u[] = { 0, }; +MegaSet smoulder_megaSet0 = { + 7, // gridWidth +}; + ExtCompact smoulder_ext = { 0, // actionSub 0, // actionSub_off @@ -727,7 +731,7 @@ ExtCompact smoulder_ext = { 0, // arTarget_y 0, // animScratch 0, // megaSet - 7, // gridWidth + &smoulder_megaSet0, }; Compact smoulder = { @@ -1185,8 +1189,8 @@ uint16 shades_r_to_l[] = { 0, }; -uint16 *shades_turnTable[5][5] = { - { // turnTableup +uint16 *shades_turnTable0[5][5] = { + { // turnTableUp 0, shades_u_to_d, shades_u_to_l, @@ -1223,6 +1227,23 @@ uint16 *shades_turnTable[5][5] = { }, }; +MegaSet shades_megaSet0 = { + 0, // gridWidth + 0, // colOffset + 8, // colWidth + 8, // lastChr + shades_up, // animUp + shades_down, // animDown + shades_left, // animLeft + shades_right, // animRight + shades_st_up, // standUp + shades_st_down, // standDown + shades_st_left, // standLeft + shades_st_right, // standRight + shades_st_talk, // standTalk + shades_turnTable0, +}; + ExtCompact shades_ext = { 0, // actionSub 0, // actionSub_off @@ -1249,19 +1270,7 @@ ExtCompact shades_ext = { 0, // arTarget_y shades_auto, // animScratch 0, // megaSet - 0, // gridWidth - 0, // colOffset - 8, // colWidth - 8, // lastChr - shades_up, // animUp - shades_down, // animDown - shades_left, // animLeft - shades_right, // animRight - shades_st_up, // standUp - shades_st_down, // standDown - shades_st_left, // standLeft - shades_st_right, // standRight - shades_st_talk, // standTalk + &shades_megaSet0, }; Compact shades = { @@ -1294,7 +1303,6 @@ Compact shades = { SHADES_LOGIC, // baseSub 0, // baseSub_off &shades_ext, - &shades_turnTable, }; uint16 liftc2_down[] = { diff --git a/sky/compacts/71comp.h b/sky/compacts/71comp.h index a640f94927..c618ae343f 100644 --- a/sky/compacts/71comp.h +++ b/sky/compacts/71comp.h @@ -394,8 +394,8 @@ uint16 medi_r_to_l[] = { 0, }; -uint16 *medi_turnTable[5][5] = { - { // turnTableup +uint16 *medi_turnTable0[5][5] = { + { // turnTableUp 0, medi_u_to_d, medi_u_to_l, @@ -432,6 +432,23 @@ uint16 *medi_turnTable[5][5] = { }, }; +MegaSet medi_megaSet0 = { + 3, // gridWidth + 8, // colOffset + 16, // colWidth + 24, // lastChr + medi_up, // animUp + medi_down, // animDown + medi_left, // animLeft + medi_right, // animRight + medi_st_up, // standUp + medi_st_down, // standDown + medi_st_left, // standLeft + medi_st_right, // standRight + 0, // standTalk + medi_turnTable0, +}; + ExtCompact medi_ext = { 0, // actionSub 0, // actionSub_off @@ -458,19 +475,7 @@ ExtCompact medi_ext = { 0, // arTarget_y medi_auto, // animScratch 0, // megaSet - 3, // gridWidth - 8, // colOffset - 16, // colWidth - 24, // lastChr - medi_up, // animUp - medi_down, // animDown - medi_left, // animLeft - medi_right, // animRight - medi_st_up, // standUp - medi_st_down, // standDown - medi_st_left, // standLeft - medi_st_right, // standRight - 0, // standTalk + &medi_megaSet0, }; Compact medi = { @@ -503,7 +508,6 @@ Compact medi = { MEDI_LOGIC, // baseSub 0, // baseSub_off &medi_ext, - &medi_turnTable, }; uint16 sc71_mouse_list[] = { diff --git a/sky/compacts/72comp.h b/sky/compacts/72comp.h index 5bf505cbf1..6b8165c870 100644 --- a/sky/compacts/72comp.h +++ b/sky/compacts/72comp.h @@ -2107,8 +2107,8 @@ uint16 wit_t_to_l[] = { 0, }; -uint16 *witness_turnTable[5][5] = { - { // turnTableup +uint16 *witness_turnTable0[5][5] = { + { // turnTableUp 0, wit_u_to_d, wit_u_to_l, @@ -2145,6 +2145,23 @@ uint16 *witness_turnTable[5][5] = { }, }; +MegaSet witness_megaSet0 = { + 3, // gridWidth + 8, // colOffset + 16, // colWidth + 24, // lastChr + wit_up, // animUp + wit_down, // animDown + wit_left, // animLeft + wit_right, // animRight + wit_st_up, // standUp + wit_st_down, // standDown + wit_st_left, // standLeft + wit_st_right, // standRight + wit_st_talk, // standTalk + witness_turnTable0, +}; + ExtCompact witness_ext = { 0, // actionSub 0, // actionSub_off @@ -2171,19 +2188,7 @@ ExtCompact witness_ext = { 0, // arTarget_y wit_auto, // animScratch 0, // megaSet - 3, // gridWidth - 8, // colOffset - 16, // colWidth - 24, // lastChr - wit_up, // animUp - wit_down, // animDown - wit_left, // animLeft - wit_right, // animRight - wit_st_up, // standUp - wit_st_down, // standDown - wit_st_left, // standLeft - wit_st_right, // standRight - wit_st_talk, // standTalk + &witness_megaSet0, }; Compact witness = { @@ -2216,7 +2221,6 @@ Compact witness = { WITNESS_LOGIC, // baseSub 0, // baseSub_off &witness_ext, - &witness_turnTable, }; uint16 sc72_logic_list[] = { diff --git a/sky/compacts/73comp.h b/sky/compacts/73comp.h index b701682c31..150f97671f 100644 --- a/sky/compacts/73comp.h +++ b/sky/compacts/73comp.h @@ -406,8 +406,8 @@ uint16 gal_r_to_l[] = { 0, }; -uint16 *gallagher_turnTable[5][5] = { - { // turnTableup +uint16 *gallagher_turnTable0[5][5] = { + { // turnTableUp 0, gal_u_to_d, gal_u_to_l, @@ -444,6 +444,23 @@ uint16 *gallagher_turnTable[5][5] = { }, }; +MegaSet gallagher_megaSet0 = { + 3, // gridWidth + 8, // colOffset + 16, // colWidth + 24, // lastChr + gal_up, // animUp + gal_down, // animDown + gal_left, // animLeft + gal_right, // animRight + gal_st_up, // standUp + gal_st_down, // standDown + gal_st_left, // standLeft + gal_st_right, // standRight + 0, // standTalk + gallagher_turnTable0, +}; + ExtCompact gallagher_ext = { 0, // actionSub 0, // actionSub_off @@ -470,19 +487,7 @@ ExtCompact gallagher_ext = { 0, // arTarget_y gal_auto, // animScratch 0, // megaSet - 3, // gridWidth - 8, // colOffset - 16, // colWidth - 24, // lastChr - gal_up, // animUp - gal_down, // animDown - gal_left, // animLeft - gal_right, // animRight - gal_st_up, // standUp - gal_st_down, // standDown - gal_st_left, // standLeft - gal_st_right, // standRight - 0, // standTalk + &gallagher_megaSet0, }; Compact gallagher = { @@ -515,7 +520,6 @@ Compact gallagher = { GALLAGHER_LOGIC73, // baseSub 0, // baseSub_off &gallagher_ext, - &gallagher_turnTable, }; uint16 sc73_joey_fight1[] = { diff --git a/sky/compacts/76comp.h b/sky/compacts/76comp.h index 70c7085945..45b89eb489 100644 --- a/sky/compacts/76comp.h +++ b/sky/compacts/76comp.h @@ -471,8 +471,8 @@ uint16 ken_r_to_l[] = { 0, }; -uint16 *ken_turnTable[5][5] = { - { // turnTableup +uint16 *ken_turnTable0[5][5] = { + { // turnTableUp 0, ken_u_to_d, ken_u_to_l, @@ -509,6 +509,23 @@ uint16 *ken_turnTable[5][5] = { }, }; +MegaSet ken_megaSet0 = { + 3, // gridWidth + 8, // colOffset + 16, // colWidth + 24, // lastChr + ken_up, // animUp + ken_down, // animDown + ken_left, // animLeft + ken_right, // animRight + ken_st_up, // standUp + ken_st_down, // standDown + ken_st_left, // standLeft + ken_st_right, // standRight + 0, // standTalk + ken_turnTable0, +}; + ExtCompact ken_ext = { 0, // actionSub 0, // actionSub_off @@ -535,19 +552,7 @@ ExtCompact ken_ext = { 0, // arTarget_y ken_auto, // animScratch 0, // megaSet - 3, // gridWidth - 8, // colOffset - 16, // colWidth - 24, // lastChr - ken_up, // animUp - ken_down, // animDown - ken_left, // animLeft - ken_right, // animRight - ken_st_up, // standUp - ken_st_down, // standDown - ken_st_left, // standLeft - ken_st_right, // standRight - 0, // standTalk + &ken_megaSet0, }; Compact ken = { @@ -580,7 +585,6 @@ Compact ken = { KEN_START_LOGIC, // baseSub 0, // baseSub_off &ken_ext, - &ken_turnTable, }; uint16 sc76_floor_table[] = { diff --git a/sky/compacts/z_compac.h b/sky/compacts/z_compac.h index d5ac7de857..6c9ec877bf 100644 --- a/sky/compacts/z_compac.h +++ b/sky/compacts/z_compac.h @@ -1039,8 +1039,8 @@ uint16 lamb_r_to_l[] = { 0, }; -uint16 *lamb_turnTable[5][5] = { - { // turnTableup +uint16 *lamb_turnTable0[5][5] = { + { // turnTableUp 0, lamb_u_to_d, lamb_u_to_l, @@ -1077,6 +1077,23 @@ uint16 *lamb_turnTable[5][5] = { }, }; +MegaSet lamb_megaSet0 = { + 3, // gridWidth + 8, // colOffset + 16, // colWidth + 24, // lastChr + lamb_up, // animUp + lamb_down, // animDown + lamb_left, // animLeft + lamb_right, // animRight + lamb_st_up, // standUp + lamb_st_down, // standDown + lamb_st_left, // standLeft + lamb_st_right, // standRight + lamb_st_talk, // standTalk + lamb_turnTable0, +}; + ExtCompact lamb_ext = { 0, // actionSub 0, // actionSub_off @@ -1103,19 +1120,7 @@ ExtCompact lamb_ext = { 0, // arTarget_y lamb_auto, // animScratch 0, // megaSet - 3, // gridWidth - 8, // colOffset - 16, // colWidth - 24, // lastChr - lamb_up, // animUp - lamb_down, // animDown - lamb_left, // animLeft - lamb_right, // animRight - lamb_st_up, // standUp - lamb_st_down, // standDown - lamb_st_left, // standLeft - lamb_st_right, // standRight - lamb_st_talk, // standTalk + &lamb_megaSet0, }; Compact lamb = { @@ -1148,7 +1153,6 @@ Compact lamb = { LAMB_FACTORY_START, // baseSub 0, // baseSub_off &lamb_ext, - &lamb_turnTable, }; uint16 bfoster_left[] = { @@ -3059,85 +3063,74 @@ uint16 sjoey_r_to_l[] = { 0, }; -UnknownStuff joey_unk = { - { // unknownStuff_1_1 - 3, - 8, - 16, - 24 +uint16 *joey_turnTable0[5][5] = { + { // turnTableUp + 0, + ljoey_u_to_d, + ljoey_u_to_l, + ljoey_u_to_r, + 0 }, - { // unknownStuff_1_2 - wjoey_up, - wjoey_down, - wjoey_left, - wjoey_right, - wjoey_st_up, - wjoey_st_down, - wjoey_st_left, - wjoey_st_right, + { // turnTableDown + ljoey_d_to_u, 0, + ljoey_d_to_l, + ljoey_d_to_r, + 0 + }, + { // turnTableLeft + ljoey_l_to_u, + ljoey_l_to_d, + 0, + ljoey_l_to_r, + 0 + }, + { // turnTableRight + ljoey_r_to_u, + ljoey_r_to_d, + ljoey_r_to_l, + 0, + 0 + }, + { // turnTableTalk + 0, + 0, + 0, + 0, + 0 + }, +}; + +uint16 *joey_turnTable1[5][5] = { + { // turnTableUp 0, wjoey_u_to_d, wjoey_u_to_l, wjoey_u_to_r, - 0, + 0 + }, + { // turnTableDown wjoey_d_to_u, 0, wjoey_d_to_l, wjoey_d_to_r, - 0, + 0 + }, + { // turnTableLeft wjoey_l_to_u, wjoey_l_to_d, 0, wjoey_l_to_r, - 0, + 0 + }, + { // turnTableRight wjoey_r_to_u, wjoey_r_to_d, wjoey_r_to_l, 0, - 0, - 0, - 0, - 0, - 0, 0 }, - { // unknownStuff_2_1 - 0, - 0, - 8, - 8 - }, - { // unknownStuff_2_2 - sjoey_up, - sjoey_down, - sjoey_left, - sjoey_right, - sjoey_st_up, - sjoey_st_down, - sjoey_st_left, - sjoey_st_right, - 0, - 0, - sjoey_u_to_d, - sjoey_u_to_l, - sjoey_u_to_r, - 0, - sjoey_d_to_u, - 0, - sjoey_d_to_l, - sjoey_d_to_r, - 0, - sjoey_l_to_u, - sjoey_l_to_d, - 0, - sjoey_l_to_r, - 0, - sjoey_r_to_u, - sjoey_r_to_d, - sjoey_r_to_l, - 0, - 0, + { // turnTableTalk 0, 0, 0, @@ -3146,32 +3139,32 @@ UnknownStuff joey_unk = { }, }; -uint16 *joey_turnTable[5][5] = { - { // turnTableup +uint16 *joey_turnTable2[5][5] = { + { // turnTableUp 0, - ljoey_u_to_d, - ljoey_u_to_l, - ljoey_u_to_r, + sjoey_u_to_d, + sjoey_u_to_l, + sjoey_u_to_r, 0 }, { // turnTableDown - ljoey_d_to_u, + sjoey_d_to_u, 0, - ljoey_d_to_l, - ljoey_d_to_r, + sjoey_d_to_l, + sjoey_d_to_r, 0 }, { // turnTableLeft - ljoey_l_to_u, - ljoey_l_to_d, + sjoey_l_to_u, + sjoey_l_to_d, 0, - ljoey_l_to_r, + sjoey_l_to_r, 0 }, { // turnTableRight - ljoey_r_to_u, - ljoey_r_to_d, - ljoey_r_to_l, + sjoey_r_to_u, + sjoey_r_to_d, + sjoey_r_to_l, 0, 0 }, @@ -3184,6 +3177,57 @@ uint16 *joey_turnTable[5][5] = { }, }; +MegaSet joey_megaSet0 = { + 3, // gridWidth + 8, // colOffset + 16, // colWidth + 24, // lastChr + ljoey_up, // animUp + ljoey_down, // animDown + ljoey_left, // animLeft + ljoey_right, // animRight + ljoey_st_up, // standUp + ljoey_st_down, // standDown + ljoey_st_left, // standLeft + ljoey_st_right, // standRight + 0, // standTalk + joey_turnTable0, +}; + +MegaSet joey_megaSet1 = { + 3, // gridWidth + 8, // colOffset + 16, // colWidth + 24, // lastChr + wjoey_up, // animUp + wjoey_down, // animDown + wjoey_left, // animLeft + wjoey_right, // animRight + wjoey_st_up, // standUp + wjoey_st_down, // standDown + wjoey_st_left, // standLeft + wjoey_st_right, // standRight + 0, // standTalk + joey_turnTable1, +}; + +MegaSet joey_megaSet2 = { + 0, // gridWidth + 0, // colOffset + 8, // colWidth + 8, // lastChr + sjoey_up, // animUp + sjoey_down, // animDown + sjoey_left, // animLeft + sjoey_right, // animRight + sjoey_st_up, // standUp + sjoey_st_down, // standDown + sjoey_st_left, // standLeft + sjoey_st_right, // standRight + 0, // standTalk + joey_turnTable2, +}; + ExtCompact joey_ext = { 0, // actionSub 0, // actionSub_off @@ -3210,19 +3254,9 @@ ExtCompact joey_ext = { 0, // arTarget_y joey_auto, // animScratch 0, // megaSet - 3, // gridWidth - 8, // colOffset - 16, // colWidth - 24, // lastChr - ljoey_up, // animUp - ljoey_down, // animDown - ljoey_left, // animLeft - ljoey_right, // animRight - ljoey_st_up, // standUp - ljoey_st_down, // standDown - ljoey_st_left, // standLeft - ljoey_st_right, // standRight - 0, // standTalk + &joey_megaSet0, + &joey_megaSet1, + &joey_megaSet2, }; Compact joey = { @@ -3255,8 +3289,6 @@ Compact joey = { JOEY_LOGIC, // baseSub 0, // baseSub_off &joey_ext, - &joey_turnTable, - &joey_unk, }; uint16 baby_logic_list[] = { @@ -4318,127 +4350,112 @@ uint16 bfoster_l_to_r[] = { 0, }; -UnknownStuff foster_unk = { - { // unknownStuff_1_1 - 3, - 8, - 16, - 24 +uint16 *foster_turnTable0[5][5] = { + { // turnTableUp + 0, + mfoster_u_to_d, + mfoster_u_to_l, + mfoster_u_to_r, + 0 }, - { // unknownStuff_1_2 - foster_up, - foster_down, - foster_left, - foster_right, - foster_st_up, - foster_st_down, - foster_st_left, - foster_st_right, - foster_st_talk, + { // turnTableDown + mfoster_d_to_u, + 0, + mfoster_d_to_l, + mfoster_d_to_r, + 0 + }, + { // turnTableLeft + mfoster_l_to_u, + mfoster_l_to_d, + 0, + mfoster_l_to_r, + 0 + }, + { // turnTableRight + mfoster_r_to_u, + mfoster_r_to_d, + mfoster_r_to_l, + 0, + 0 + }, + { // turnTableTalk + 0, + 0, + 0, + 0, + 0 + }, +}; + +uint16 *foster_turnTable1[5][5] = { + { // turnTableUp 0, foster_u_to_d, foster_u_to_l, foster_u_to_r, - foster_u_to_t, + foster_u_to_t + }, + { // turnTableDown foster_d_to_u, 0, foster_d_to_l, foster_d_to_r, - 0, + 0 + }, + { // turnTableLeft foster_l_to_u, foster_l_to_d, 0, foster_l_to_r, - foster_l_to_t, + foster_l_to_t + }, + { // turnTableRight foster_r_to_u, foster_r_to_d, foster_r_to_l, 0, - 0, + 0 + }, + { // turnTableTalk foster_t_to_u, 0, foster_t_to_l, 0, 0 }, - { // unknownStuff_2_1 - 3, - 8, - 16, - 24 - }, - { // unknownStuff_2_2 - fradman_up, - fradman_down, - fradman_left, - fradman_right, - fradman_st_up, - fradman_st_down, - fradman_st_left, - fradman_st_right, - fradman_st_talk, +}; + +uint16 *foster_turnTable2[5][5] = { + { // turnTableUp 0, fradman_u_to_d, fradman_u_to_l, fradman_u_to_r, - 0, + 0 + }, + { // turnTableDown fradman_d_to_u, 0, fradman_d_to_l, fradman_d_to_r, - 0, + 0 + }, + { // turnTableLeft fradman_l_to_u, fradman_l_to_d, 0, fradman_l_to_r, - 0, + 0 + }, + { // turnTableRight fradman_r_to_u, fradman_r_to_d, fradman_r_to_l, 0, - 0, - 0, - 0, - 0, - 0, 0 }, - { // unknownStuff_3_1 - 3, - 8, - 16, - 24 - }, - { // unknownStuff_3_2 - bfoster_up, - bfoster_down, - bfoster_left, - bfoster_right, - bfoster_st_up, - bfoster_st_down, - bfoster_st_left, - bfoster_st_right, - 0, - 0, - bfoster_u_to_d, - bfoster_u_to_l, - bfoster_u_to_r, - 0, - bfoster_d_to_u, - 0, - bfoster_d_to_l, - bfoster_d_to_r, - 0, - bfoster_l_to_u, - bfoster_l_to_d, - 0, - bfoster_l_to_r, - 0, - bfoster_r_to_u, - bfoster_r_to_d, - bfoster_r_to_l, - 0, - 0, + { // turnTableTalk 0, 0, 0, @@ -4447,32 +4464,32 @@ UnknownStuff foster_unk = { }, }; -uint16 *foster_turnTable[5][5] = { - { // turnTableup +uint16 *foster_turnTable3[5][5] = { + { // turnTableUp 0, - mfoster_u_to_d, - mfoster_u_to_l, - mfoster_u_to_r, + bfoster_u_to_d, + bfoster_u_to_l, + bfoster_u_to_r, 0 }, { // turnTableDown - mfoster_d_to_u, + bfoster_d_to_u, 0, - mfoster_d_to_l, - mfoster_d_to_r, + bfoster_d_to_l, + bfoster_d_to_r, 0 }, { // turnTableLeft - mfoster_l_to_u, - mfoster_l_to_d, + bfoster_l_to_u, + bfoster_l_to_d, 0, - mfoster_l_to_r, + bfoster_l_to_r, 0 }, { // turnTableRight - mfoster_r_to_u, - mfoster_r_to_d, - mfoster_r_to_l, + bfoster_r_to_u, + bfoster_r_to_d, + bfoster_r_to_l, 0, 0 }, @@ -4485,6 +4502,74 @@ uint16 *foster_turnTable[5][5] = { }, }; +MegaSet foster_megaSet0 = { + 0, // gridWidth + 0, // colOffset + 8, // colWidth + 8, // lastChr + mfoster_up, // animUp + mfoster_down, // animDown + mfoster_left, // animLeft + mfoster_right, // animRight + mfoster_st_up, // standUp + mfoster_st_down, // standDown + mfoster_st_left, // standLeft + mfoster_st_right, // standRight + 0, // standTalk + foster_turnTable0, +}; + +MegaSet foster_megaSet1 = { + 3, // gridWidth + 8, // colOffset + 16, // colWidth + 24, // lastChr + foster_up, // animUp + foster_down, // animDown + foster_left, // animLeft + foster_right, // animRight + foster_st_up, // standUp + foster_st_down, // standDown + foster_st_left, // standLeft + foster_st_right, // standRight + foster_st_talk, // standTalk + foster_turnTable1, +}; + +MegaSet foster_megaSet2 = { + 3, // gridWidth + 8, // colOffset + 16, // colWidth + 24, // lastChr + fradman_up, // animUp + fradman_down, // animDown + fradman_left, // animLeft + fradman_right, // animRight + fradman_st_up, // standUp + fradman_st_down, // standDown + fradman_st_left, // standLeft + fradman_st_right, // standRight + fradman_st_talk, // standTalk + foster_turnTable2, +}; + +MegaSet foster_megaSet3 = { + 3, // gridWidth + 8, // colOffset + 16, // colWidth + 24, // lastChr + bfoster_up, // animUp + bfoster_down, // animDown + bfoster_left, // animLeft + bfoster_right, // animRight + bfoster_st_up, // standUp + bfoster_st_down, // standDown + bfoster_st_left, // standLeft + bfoster_st_right, // standRight + 0, // standTalk + foster_turnTable3, +}; + ExtCompact foster_ext = { 0, // actionSub 0, // actionSub_off @@ -4511,19 +4596,10 @@ ExtCompact foster_ext = { 0, // arTarget_y minif_auto, // animScratch 0, // megaSet - 0, // gridWidth - 0, // colOffset - 8, // colWidth - 8, // lastChr - mfoster_up, // animUp - mfoster_down, // animDown - mfoster_left, // animLeft - mfoster_right, // animRight - mfoster_st_up, // standUp - mfoster_st_down, // standDown - mfoster_st_left, // standLeft - mfoster_st_right, // standRight - 0, // standTalk + &foster_megaSet0, + &foster_megaSet1, + &foster_megaSet2, + &foster_megaSet3, }; Compact foster = { @@ -4556,8 +4632,6 @@ Compact foster = { BASE_INTRO, // baseSub 0, // baseSub_off &foster_ext, - &foster_turnTable, - &foster_unk, }; uint16 monitor_up[] = { @@ -5068,8 +5142,8 @@ uint16 monitor_r_to_l[] = { 0, }; -uint16 *monitor_turnTable[5][5] = { - { // turnTableup +uint16 *monitor_turnTable0[5][5] = { + { // turnTableUp 0, monitor_u_to_d, monitor_u_to_l, @@ -5106,6 +5180,23 @@ uint16 *monitor_turnTable[5][5] = { }, }; +MegaSet monitor_megaSet0 = { + 3, // gridWidth + 8, // colOffset + 16, // colWidth + 24, // lastChr + monitor_up, // animUp + monitor_down, // animDown + monitor_left, // animLeft + monitor_right, // animRight + monitor_st_up, // standUp + monitor_st_down, // standDown + monitor_st_left, // standLeft + monitor_st_right, // standRight + monitor_st_talk, // standTalk + monitor_turnTable0, +}; + ExtCompact monitor_ext = { 0, // actionSub 0, // actionSub_off @@ -5132,19 +5223,7 @@ ExtCompact monitor_ext = { 0, // arTarget_y monitor_auto, // animScratch 0, // megaSet - 3, // gridWidth - 8, // colOffset - 16, // colWidth - 24, // lastChr - monitor_up, // animUp - monitor_down, // animDown - monitor_left, // animLeft - monitor_right, // animRight - monitor_st_up, // standUp - monitor_st_down, // standDown - monitor_st_left, // standLeft - monitor_st_right, // standRight - monitor_st_talk, // standTalk + &monitor_megaSet0, }; Compact monitor = { @@ -5177,7 +5256,6 @@ Compact monitor = { MONITOR_SLEEP, // baseSub 0, // baseSub_off &monitor_ext, - &monitor_turnTable, }; ExtCompact anita_ext = { |