Introduce enums for specific data directories
This commit is contained in:
gamemasterplc
parent
ce056b82a0
commit
6d67132ca4
21 changed files with 603 additions and 535 deletions
23
include/data_num/title.h
Normal file
23
include/data_num/title.h
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
#ifndef DATANUM_TITLE_H
|
||||
#define DATANUM_TITLE_H
|
||||
|
||||
#include "datadir_enum.h"
|
||||
|
||||
enum {
|
||||
TITLE_NINTENDO_ANM = DATA_MAKE_NUM(DATADIR_TITLE, 0),
|
||||
TITLE_HUDSON_ANM = DATA_MAKE_NUM(DATADIR_TITLE, 1),
|
||||
TITLE_PRESS_START_ANM = DATA_MAKE_NUM(DATADIR_TITLE, 2),
|
||||
TITLE_PROGRESSIVE_CHOOSE_ANM = DATA_MAKE_NUM(DATADIR_TITLE, 3),
|
||||
TITLE_PROGRESSIVE_ON_ANM = DATA_MAKE_NUM(DATADIR_TITLE, 4),
|
||||
TITLE_PROGRESSIVE_OFF_ANM = DATA_MAKE_NUM(DATADIR_TITLE, 5),
|
||||
TITLE_PROGRESSIVE_CURSOR_ON_ANM = DATA_MAKE_NUM(DATADIR_TITLE, 6),
|
||||
TITLE_PROGRESSIVE_CURSOR_OFF_ANM = DATA_MAKE_NUM(DATADIR_TITLE, 7),
|
||||
TITLE_BG_ANM = DATA_MAKE_NUM(DATADIR_TITLE, 8),
|
||||
TITLE_LOGO_ANM = DATA_MAKE_NUM(DATADIR_TITLE, 9),
|
||||
TITLE_COPYRIGHT_ANM = DATA_MAKE_NUM(DATADIR_TITLE, 10),
|
||||
TITLE_CHAR_HSF = DATA_MAKE_NUM(DATADIR_TITLE, 11),
|
||||
TITLE_CUBE_HSF = DATA_MAKE_NUM(DATADIR_TITLE, 12),
|
||||
TITLE_SKY_HSF = DATA_MAKE_NUM(DATADIR_TITLE, 13),
|
||||
};
|
||||
|
||||
#endif
|
||||
37
include/data_num/win.h
Normal file
37
include/data_num/win.h
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
#ifndef DATANUM_WIN_H
|
||||
#define DATANUM_WIN_H
|
||||
|
||||
#include "datadir_enum.h"
|
||||
|
||||
enum {
|
||||
WIN_FONTJ_ANM = DATA_MAKE_NUM(DATADIR_WIN, 0),
|
||||
WIN_FONTE_ANM = DATA_MAKE_NUM(DATADIR_WIN, 1),
|
||||
WIN_CURSOR_ANM = DATA_MAKE_NUM(DATADIR_WIN, 2),
|
||||
WIN_ICON_ANM = DATA_MAKE_NUM(DATADIR_WIN, 3),
|
||||
WIN_CARDA_ANM = DATA_MAKE_NUM(DATADIR_WIN, 4),
|
||||
WIN_CARDB_ANM = DATA_MAKE_NUM(DATADIR_WIN, 5),
|
||||
WIN_FRAME1_ANM = DATA_MAKE_NUM(DATADIR_WIN, 6),
|
||||
WIN_FRAME2_ANM = DATA_MAKE_NUM(DATADIR_WIN, 7),
|
||||
WIN_FRAME3_ANM = DATA_MAKE_NUM(DATADIR_WIN, 8),
|
||||
WIN_W01_HOST_TALK_ANM = DATA_MAKE_NUM(DATADIR_WIN, 9),
|
||||
WIN_W02_HOST_TALK_ANM = DATA_MAKE_NUM(DATADIR_WIN, 10),
|
||||
WIN_W03_HOST_TALK_ANM = DATA_MAKE_NUM(DATADIR_WIN, 11),
|
||||
WIN_W04_HOST_TALK_ANM = DATA_MAKE_NUM(DATADIR_WIN, 12),
|
||||
WIN_W05_HOST_TALK_ANM = DATA_MAKE_NUM(DATADIR_WIN, 13),
|
||||
WIN_W06_HOST_TALK_ANM = DATA_MAKE_NUM(DATADIR_WIN, 14),
|
||||
WIN_TOAD_TALK_ANM = DATA_MAKE_NUM(DATADIR_WIN, 15),
|
||||
WIN_BOBOMB_TALK_ANM = DATA_MAKE_NUM(DATADIR_WIN, 16),
|
||||
WIN_SHYGUY_TALK_ANM = DATA_MAKE_NUM(DATADIR_WIN, 17),
|
||||
WIN_BOO_TALK_ANM = DATA_MAKE_NUM(DATADIR_WIN, 18),
|
||||
WIN_GOOMBA_TALK_ANM = DATA_MAKE_NUM(DATADIR_WIN, 19),
|
||||
WIN_BOWSER_TALK_ANM = DATA_MAKE_NUM(DATADIR_WIN, 20),
|
||||
WIN_KKID_TALK_ANM = DATA_MAKE_NUM(DATADIR_WIN, 21),
|
||||
WIN_KOOPA_TALK_ANM = DATA_MAKE_NUM(DATADIR_WIN, 22),
|
||||
WIN_CONDOR_TALK_ANM = DATA_MAKE_NUM(DATADIR_WIN, 23),
|
||||
WIN_BOO_BLUE_TALK_ANM = DATA_MAKE_NUM(DATADIR_WIN, 24),
|
||||
WIN_DOLPHIN_TALK_ANM = DATA_MAKE_NUM(DATADIR_WIN, 25),
|
||||
WIN_BOO_RED_TALK_ANM = DATA_MAKE_NUM(DATADIR_WIN, 26),
|
||||
WIN_THWOMP_TALK_ANM = DATA_MAKE_NUM(DATADIR_WIN, 27),
|
||||
};
|
||||
|
||||
#endif
|
||||
23
include/datadir_enum.h
Normal file
23
include/datadir_enum.h
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
#ifndef DATADIR_ENUM
|
||||
#define DATADIR_ENUM
|
||||
|
||||
#define DATADIR_DEFINE(name, path) DATADIR_ID_##name,
|
||||
|
||||
typedef enum {
|
||||
#include "datadir_table.h"
|
||||
DATADIR_ID_MAX
|
||||
};
|
||||
|
||||
#undef DATADIR_DEFINE
|
||||
|
||||
#define DATADIR_DEFINE(name, path) DATADIR_##name = (DATADIR_ID_##name) << 16,
|
||||
|
||||
typedef enum {
|
||||
#include "datadir_table.h"
|
||||
};
|
||||
|
||||
#undef DATADIR_DEFINE
|
||||
|
||||
#define DATA_MAKE_NUM(dir, file) ((dir)+(file))
|
||||
|
||||
#endif
|
||||
|
|
@ -1,140 +1,140 @@
|
|||
DATADIR_DEFINE(DATADIR_E3SETUP, "data/E3setup.bin")
|
||||
DATADIR_DEFINE(DATADIR_BBATTLE, "data/bbattle.bin")
|
||||
DATADIR_DEFINE(DATADIR_BGUEST, "data/bguest.bin")
|
||||
DATADIR_DEFINE(DATADIR_BKOOPA, "data/bkoopa.bin")
|
||||
DATADIR_DEFINE(DATADIR_BKOOPASUIT, "data/bkoopasuit.bin")
|
||||
DATADIR_DEFINE(DATADIR_BKUJIYA, "data/bkujiya.bin")
|
||||
DATADIR_DEFINE(DATADIR_BLAST5, "data/blast5.bin")
|
||||
DATADIR_DEFINE(DATADIR_BOARD, "data/board.bin")
|
||||
DATADIR_DEFINE(DATADIR_BPAUSE, "data/bpause.bin")
|
||||
DATADIR_DEFINE(DATADIR_BYOKODORI, "data/byokodori.bin")
|
||||
DATADIR_DEFINE(DATADIR_DAISY, "data/daisy.bin")
|
||||
DATADIR_DEFINE(DATADIR_DAISYMDL0, "data/daisymdl0.bin")
|
||||
DATADIR_DEFINE(DATADIR_DAISYMDL1, "data/daisymdl1.bin")
|
||||
DATADIR_DEFINE(DATADIR_DAISYMOT, "data/daisymot.bin")
|
||||
DATADIR_DEFINE(DATADIR_DONKEY, "data/donkey.bin")
|
||||
DATADIR_DEFINE(DATADIR_DONKEYMDL0, "data/donkeymdl0.bin")
|
||||
DATADIR_DEFINE(DATADIR_DONKEYMDL1, "data/donkeymdl1.bin")
|
||||
DATADIR_DEFINE(DATADIR_DONKEYMOT, "data/donkeymot.bin")
|
||||
DATADIR_DEFINE(DATADIR_EFFECT, "data/effect.bin")
|
||||
DATADIR_DEFINE(DATADIR_GAMEMES, "data/gamemes.bin")
|
||||
DATADIR_DEFINE(DATADIR_INST, "data/inst.bin")
|
||||
DATADIR_DEFINE(DATADIR_INSTFONT, "data/instfont.bin")
|
||||
DATADIR_DEFINE(DATADIR_INSTPIC, "data/instpic.bin")
|
||||
DATADIR_DEFINE(DATADIR_LUIGI, "data/luigi.bin")
|
||||
DATADIR_DEFINE(DATADIR_LUIGIMDL0, "data/luigimdl0.bin")
|
||||
DATADIR_DEFINE(DATADIR_LUIGIMDL1, "data/luigimdl1.bin")
|
||||
DATADIR_DEFINE(DATADIR_LUIGIMOT, "data/luigimot.bin")
|
||||
DATADIR_DEFINE(DATADIR_M300, "data/m300.bin")
|
||||
DATADIR_DEFINE(DATADIR_M302, "data/m302.bin")
|
||||
DATADIR_DEFINE(DATADIR_M303, "data/m303.bin")
|
||||
DATADIR_DEFINE(DATADIR_M330, "data/m330.bin")
|
||||
DATADIR_DEFINE(DATADIR_M333, "data/m333.bin")
|
||||
DATADIR_DEFINE(DATADIR_M401, "data/m401.bin")
|
||||
DATADIR_DEFINE(DATADIR_M402, "data/m402.bin")
|
||||
DATADIR_DEFINE(DATADIR_M403, "data/m403.bin")
|
||||
DATADIR_DEFINE(DATADIR_M404, "data/m404.bin")
|
||||
DATADIR_DEFINE(DATADIR_M405, "data/m405.bin")
|
||||
DATADIR_DEFINE(DATADIR_M406, "data/m406.bin")
|
||||
DATADIR_DEFINE(DATADIR_M407, "data/m407.bin")
|
||||
DATADIR_DEFINE(DATADIR_M408, "data/m408.bin")
|
||||
DATADIR_DEFINE(DATADIR_M409, "data/m409.bin")
|
||||
DATADIR_DEFINE(DATADIR_M410, "data/m410.bin")
|
||||
DATADIR_DEFINE(DATADIR_M411, "data/m411.bin")
|
||||
DATADIR_DEFINE(DATADIR_M412, "data/m412.bin")
|
||||
DATADIR_DEFINE(DATADIR_M413, "data/m413.bin")
|
||||
DATADIR_DEFINE(DATADIR_M414, "data/m414.bin")
|
||||
DATADIR_DEFINE(DATADIR_M415, "data/m415.bin")
|
||||
DATADIR_DEFINE(DATADIR_M416, "data/m416.bin")
|
||||
DATADIR_DEFINE(DATADIR_M417, "data/m417.bin")
|
||||
DATADIR_DEFINE(DATADIR_M418, "data/m418.bin")
|
||||
DATADIR_DEFINE(DATADIR_M419, "data/m419.bin")
|
||||
DATADIR_DEFINE(DATADIR_M420, "data/m420.bin")
|
||||
DATADIR_DEFINE(DATADIR_M421, "data/m421.bin")
|
||||
DATADIR_DEFINE(DATADIR_M422, "data/m422.bin")
|
||||
DATADIR_DEFINE(DATADIR_M423, "data/m423.bin")
|
||||
DATADIR_DEFINE(DATADIR_M424, "data/m424.bin")
|
||||
DATADIR_DEFINE(DATADIR_M425, "data/m425.bin")
|
||||
DATADIR_DEFINE(DATADIR_M426, "data/m426.bin")
|
||||
DATADIR_DEFINE(DATADIR_M427, "data/m427.bin")
|
||||
DATADIR_DEFINE(DATADIR_M428, "data/m428.bin")
|
||||
DATADIR_DEFINE(DATADIR_M429, "data/m429.bin")
|
||||
DATADIR_DEFINE(DATADIR_M430, "data/m430.bin")
|
||||
DATADIR_DEFINE(DATADIR_M431, "data/m431.bin")
|
||||
DATADIR_DEFINE(DATADIR_M432, "data/m432.bin")
|
||||
DATADIR_DEFINE(DATADIR_M433, "data/m433.bin")
|
||||
DATADIR_DEFINE(DATADIR_M434, "data/m434.bin")
|
||||
DATADIR_DEFINE(DATADIR_M435, "data/m435.bin")
|
||||
DATADIR_DEFINE(DATADIR_M436, "data/m436.bin")
|
||||
DATADIR_DEFINE(DATADIR_M437, "data/m437.bin")
|
||||
DATADIR_DEFINE(DATADIR_M438, "data/m438.bin")
|
||||
DATADIR_DEFINE(DATADIR_M439, "data/m439.bin")
|
||||
DATADIR_DEFINE(DATADIR_M440, "data/m440.bin")
|
||||
DATADIR_DEFINE(DATADIR_M441, "data/m441.bin")
|
||||
DATADIR_DEFINE(DATADIR_M442, "data/m442.bin")
|
||||
DATADIR_DEFINE(DATADIR_M443, "data/m443.bin")
|
||||
DATADIR_DEFINE(DATADIR_M444, "data/m444.bin")
|
||||
DATADIR_DEFINE(DATADIR_M445, "data/m445.bin")
|
||||
DATADIR_DEFINE(DATADIR_M446, "data/m446.bin")
|
||||
DATADIR_DEFINE(DATADIR_M447, "data/m447.bin")
|
||||
DATADIR_DEFINE(DATADIR_M448, "data/m448.bin")
|
||||
DATADIR_DEFINE(DATADIR_M449, "data/m449.bin")
|
||||
DATADIR_DEFINE(DATADIR_M450, "data/m450.bin")
|
||||
DATADIR_DEFINE(DATADIR_M451, "data/m451.bin")
|
||||
DATADIR_DEFINE(DATADIR_M453, "data/m453.bin")
|
||||
DATADIR_DEFINE(DATADIR_M455, "data/m455.bin")
|
||||
DATADIR_DEFINE(DATADIR_M456, "data/m456.bin")
|
||||
DATADIR_DEFINE(DATADIR_M457, "data/m457.bin")
|
||||
DATADIR_DEFINE(DATADIR_M458, "data/m458.bin")
|
||||
DATADIR_DEFINE(DATADIR_M459, "data/m459.bin")
|
||||
DATADIR_DEFINE(DATADIR_M460, "data/m460.bin")
|
||||
DATADIR_DEFINE(DATADIR_M461, "data/m461.bin")
|
||||
DATADIR_DEFINE(DATADIR_M462, "data/m462.bin")
|
||||
DATADIR_DEFINE(DATADIR_MARIO, "data/mario.bin")
|
||||
DATADIR_DEFINE(DATADIR_MARIOMDL0, "data/mariomdl0.bin")
|
||||
DATADIR_DEFINE(DATADIR_MARIOMDL1, "data/mariomdl1.bin")
|
||||
DATADIR_DEFINE(DATADIR_MARIOMOT, "data/mariomot.bin")
|
||||
DATADIR_DEFINE(DATADIR_MENT, "data/ment.bin")
|
||||
DATADIR_DEFINE(DATADIR_MGCONST, "data/mgconst.bin")
|
||||
DATADIR_DEFINE(DATADIR_MGMODE, "data/mgmode.bin")
|
||||
DATADIR_DEFINE(DATADIR_MODESEL, "data/modesel.bin")
|
||||
DATADIR_DEFINE(DATADIR_MPEX, "data/mpex.bin")
|
||||
DATADIR_DEFINE(DATADIR_MSTORY, "data/mstory.bin")
|
||||
DATADIR_DEFINE(DATADIR_MSTORY2, "data/mstory2.bin")
|
||||
DATADIR_DEFINE(DATADIR_MSTORY3, "data/mstory3.bin")
|
||||
DATADIR_DEFINE(DATADIR_MSTORY4, "data/mstory4.bin")
|
||||
DATADIR_DEFINE(DATADIR_OPTION, "data/option.bin")
|
||||
DATADIR_DEFINE(DATADIR_PEACH, "data/peach.bin")
|
||||
DATADIR_DEFINE(DATADIR_PEACHMDL0, "data/peachmdl0.bin")
|
||||
DATADIR_DEFINE(DATADIR_PEACHMDL1, "data/peachmdl1.bin")
|
||||
DATADIR_DEFINE(DATADIR_PEACHMOT, "data/peachmot.bin")
|
||||
DATADIR_DEFINE(DATADIR_PRESENT, "data/present.bin")
|
||||
DATADIR_DEFINE(DATADIR_RESULT, "data/result.bin")
|
||||
DATADIR_DEFINE(DATADIR_SAF, "data/saf.bin")
|
||||
DATADIR_DEFINE(DATADIR_SELMENU, "data/selmenu.bin")
|
||||
DATADIR_DEFINE(DATADIR_SETUP, "data/setup.bin")
|
||||
DATADIR_DEFINE(DATADIR_STAFF, "data/staff.bin")
|
||||
DATADIR_DEFINE(DATADIR_TITLE, "data/title.bin")
|
||||
DATADIR_DEFINE(DATADIR_W01, "data/w01.bin")
|
||||
DATADIR_DEFINE(DATADIR_W02, "data/w02.bin")
|
||||
DATADIR_DEFINE(DATADIR_W03, "data/w03.bin")
|
||||
DATADIR_DEFINE(DATADIR_W04, "data/w04.bin")
|
||||
DATADIR_DEFINE(DATADIR_W05, "data/w05.bin")
|
||||
DATADIR_DEFINE(DATADIR_W06, "data/w06.bin")
|
||||
DATADIR_DEFINE(DATADIR_W10, "data/w10.bin")
|
||||
DATADIR_DEFINE(DATADIR_W20, "data/w20.bin")
|
||||
DATADIR_DEFINE(DATADIR_W21, "data/w21.bin")
|
||||
DATADIR_DEFINE(DATADIR_WALUIGI, "data/waluigi.bin")
|
||||
DATADIR_DEFINE(DATADIR_WALUIGIMDL0, "data/waluigimdl0.bin")
|
||||
DATADIR_DEFINE(DATADIR_WALUIGIMDL1, "data/waluigimdl1.bin")
|
||||
DATADIR_DEFINE(DATADIR_WALUIGIMOT, "data/waluigimot.bin")
|
||||
DATADIR_DEFINE(DATADIR_WARIO, "data/wario.bin")
|
||||
DATADIR_DEFINE(DATADIR_WARIOMDL0, "data/wariomdl0.bin")
|
||||
DATADIR_DEFINE(DATADIR_WARIOMDL1, "data/wariomdl1.bin")
|
||||
DATADIR_DEFINE(DATADIR_WARIOMOT, "data/wariomot.bin")
|
||||
DATADIR_DEFINE(DATADIR_WIN, "data/win.bin")
|
||||
DATADIR_DEFINE(DATADIR_YOSHI, "data/yoshi.bin")
|
||||
DATADIR_DEFINE(DATADIR_YOSHIMDL0, "data/yoshimdl0.bin")
|
||||
DATADIR_DEFINE(DATADIR_YOSHIMDL1, "data/yoshimdl1.bin")
|
||||
DATADIR_DEFINE(DATADIR_YOSHIMOT, "data/yoshimot.bin")
|
||||
DATADIR_DEFINE(DATADIR_ZTAR, "data/ztar.bin")
|
||||
DATADIR_DEFINE(E3SETUP, "data/E3setup.bin")
|
||||
DATADIR_DEFINE(BBATTLE, "data/bbattle.bin")
|
||||
DATADIR_DEFINE(BGUEST, "data/bguest.bin")
|
||||
DATADIR_DEFINE(BKOOPA, "data/bkoopa.bin")
|
||||
DATADIR_DEFINE(BKOOPASUIT, "data/bkoopasuit.bin")
|
||||
DATADIR_DEFINE(BKUJIYA, "data/bkujiya.bin")
|
||||
DATADIR_DEFINE(BLAST5, "data/blast5.bin")
|
||||
DATADIR_DEFINE(BOARD, "data/board.bin")
|
||||
DATADIR_DEFINE(BPAUSE, "data/bpause.bin")
|
||||
DATADIR_DEFINE(BYOKODORI, "data/byokodori.bin")
|
||||
DATADIR_DEFINE(DAISY, "data/daisy.bin")
|
||||
DATADIR_DEFINE(DAISYMDL0, "data/daisymdl0.bin")
|
||||
DATADIR_DEFINE(DAISYMDL1, "data/daisymdl1.bin")
|
||||
DATADIR_DEFINE(DAISYMOT, "data/daisymot.bin")
|
||||
DATADIR_DEFINE(DONKEY, "data/donkey.bin")
|
||||
DATADIR_DEFINE(DONKEYMDL0, "data/donkeymdl0.bin")
|
||||
DATADIR_DEFINE(DONKEYMDL1, "data/donkeymdl1.bin")
|
||||
DATADIR_DEFINE(DONKEYMOT, "data/donkeymot.bin")
|
||||
DATADIR_DEFINE(EFFECT, "data/effect.bin")
|
||||
DATADIR_DEFINE(GAMEMES, "data/gamemes.bin")
|
||||
DATADIR_DEFINE(INST, "data/inst.bin")
|
||||
DATADIR_DEFINE(INSTFONT, "data/instfont.bin")
|
||||
DATADIR_DEFINE(INSTPIC, "data/instpic.bin")
|
||||
DATADIR_DEFINE(LUIGI, "data/luigi.bin")
|
||||
DATADIR_DEFINE(LUIGIMDL0, "data/luigimdl0.bin")
|
||||
DATADIR_DEFINE(LUIGIMDL1, "data/luigimdl1.bin")
|
||||
DATADIR_DEFINE(LUIGIMOT, "data/luigimot.bin")
|
||||
DATADIR_DEFINE(M300, "data/m300.bin")
|
||||
DATADIR_DEFINE(M302, "data/m302.bin")
|
||||
DATADIR_DEFINE(M303, "data/m303.bin")
|
||||
DATADIR_DEFINE(M330, "data/m330.bin")
|
||||
DATADIR_DEFINE(M333, "data/m333.bin")
|
||||
DATADIR_DEFINE(M401, "data/m401.bin")
|
||||
DATADIR_DEFINE(M402, "data/m402.bin")
|
||||
DATADIR_DEFINE(M403, "data/m403.bin")
|
||||
DATADIR_DEFINE(M404, "data/m404.bin")
|
||||
DATADIR_DEFINE(M405, "data/m405.bin")
|
||||
DATADIR_DEFINE(M406, "data/m406.bin")
|
||||
DATADIR_DEFINE(M407, "data/m407.bin")
|
||||
DATADIR_DEFINE(M408, "data/m408.bin")
|
||||
DATADIR_DEFINE(M409, "data/m409.bin")
|
||||
DATADIR_DEFINE(M410, "data/m410.bin")
|
||||
DATADIR_DEFINE(M411, "data/m411.bin")
|
||||
DATADIR_DEFINE(M412, "data/m412.bin")
|
||||
DATADIR_DEFINE(M413, "data/m413.bin")
|
||||
DATADIR_DEFINE(M414, "data/m414.bin")
|
||||
DATADIR_DEFINE(M415, "data/m415.bin")
|
||||
DATADIR_DEFINE(M416, "data/m416.bin")
|
||||
DATADIR_DEFINE(M417, "data/m417.bin")
|
||||
DATADIR_DEFINE(M418, "data/m418.bin")
|
||||
DATADIR_DEFINE(M419, "data/m419.bin")
|
||||
DATADIR_DEFINE(M420, "data/m420.bin")
|
||||
DATADIR_DEFINE(M421, "data/m421.bin")
|
||||
DATADIR_DEFINE(M422, "data/m422.bin")
|
||||
DATADIR_DEFINE(M423, "data/m423.bin")
|
||||
DATADIR_DEFINE(M424, "data/m424.bin")
|
||||
DATADIR_DEFINE(M425, "data/m425.bin")
|
||||
DATADIR_DEFINE(M426, "data/m426.bin")
|
||||
DATADIR_DEFINE(M427, "data/m427.bin")
|
||||
DATADIR_DEFINE(M428, "data/m428.bin")
|
||||
DATADIR_DEFINE(M429, "data/m429.bin")
|
||||
DATADIR_DEFINE(M430, "data/m430.bin")
|
||||
DATADIR_DEFINE(M431, "data/m431.bin")
|
||||
DATADIR_DEFINE(M432, "data/m432.bin")
|
||||
DATADIR_DEFINE(M433, "data/m433.bin")
|
||||
DATADIR_DEFINE(M434, "data/m434.bin")
|
||||
DATADIR_DEFINE(M435, "data/m435.bin")
|
||||
DATADIR_DEFINE(M436, "data/m436.bin")
|
||||
DATADIR_DEFINE(M437, "data/m437.bin")
|
||||
DATADIR_DEFINE(M438, "data/m438.bin")
|
||||
DATADIR_DEFINE(M439, "data/m439.bin")
|
||||
DATADIR_DEFINE(M440, "data/m440.bin")
|
||||
DATADIR_DEFINE(M441, "data/m441.bin")
|
||||
DATADIR_DEFINE(M442, "data/m442.bin")
|
||||
DATADIR_DEFINE(M443, "data/m443.bin")
|
||||
DATADIR_DEFINE(M444, "data/m444.bin")
|
||||
DATADIR_DEFINE(M445, "data/m445.bin")
|
||||
DATADIR_DEFINE(M446, "data/m446.bin")
|
||||
DATADIR_DEFINE(M447, "data/m447.bin")
|
||||
DATADIR_DEFINE(M448, "data/m448.bin")
|
||||
DATADIR_DEFINE(M449, "data/m449.bin")
|
||||
DATADIR_DEFINE(M450, "data/m450.bin")
|
||||
DATADIR_DEFINE(M451, "data/m451.bin")
|
||||
DATADIR_DEFINE(M453, "data/m453.bin")
|
||||
DATADIR_DEFINE(M455, "data/m455.bin")
|
||||
DATADIR_DEFINE(M456, "data/m456.bin")
|
||||
DATADIR_DEFINE(M457, "data/m457.bin")
|
||||
DATADIR_DEFINE(M458, "data/m458.bin")
|
||||
DATADIR_DEFINE(M459, "data/m459.bin")
|
||||
DATADIR_DEFINE(M460, "data/m460.bin")
|
||||
DATADIR_DEFINE(M461, "data/m461.bin")
|
||||
DATADIR_DEFINE(M462, "data/m462.bin")
|
||||
DATADIR_DEFINE(MARIO, "data/mario.bin")
|
||||
DATADIR_DEFINE(MARIOMDL0, "data/mariomdl0.bin")
|
||||
DATADIR_DEFINE(MARIOMDL1, "data/mariomdl1.bin")
|
||||
DATADIR_DEFINE(MARIOMOT, "data/mariomot.bin")
|
||||
DATADIR_DEFINE(MENT, "data/ment.bin")
|
||||
DATADIR_DEFINE(MGCONST, "data/mgconst.bin")
|
||||
DATADIR_DEFINE(MGMODE, "data/mgmode.bin")
|
||||
DATADIR_DEFINE(MODESEL, "data/modesel.bin")
|
||||
DATADIR_DEFINE(MPEX, "data/mpex.bin")
|
||||
DATADIR_DEFINE(MSTORY, "data/mstory.bin")
|
||||
DATADIR_DEFINE(MSTORY2, "data/mstory2.bin")
|
||||
DATADIR_DEFINE(MSTORY3, "data/mstory3.bin")
|
||||
DATADIR_DEFINE(MSTORY4, "data/mstory4.bin")
|
||||
DATADIR_DEFINE(OPTION, "data/option.bin")
|
||||
DATADIR_DEFINE(PEACH, "data/peach.bin")
|
||||
DATADIR_DEFINE(PEACHMDL0, "data/peachmdl0.bin")
|
||||
DATADIR_DEFINE(PEACHMDL1, "data/peachmdl1.bin")
|
||||
DATADIR_DEFINE(PEACHMOT, "data/peachmot.bin")
|
||||
DATADIR_DEFINE(PRESENT, "data/present.bin")
|
||||
DATADIR_DEFINE(RESULT, "data/result.bin")
|
||||
DATADIR_DEFINE(SAF, "data/saf.bin")
|
||||
DATADIR_DEFINE(SELMENU, "data/selmenu.bin")
|
||||
DATADIR_DEFINE(SETUP, "data/setup.bin")
|
||||
DATADIR_DEFINE(STAFF, "data/staff.bin")
|
||||
DATADIR_DEFINE(TITLE, "data/title.bin")
|
||||
DATADIR_DEFINE(W01, "data/w01.bin")
|
||||
DATADIR_DEFINE(W02, "data/w02.bin")
|
||||
DATADIR_DEFINE(W03, "data/w03.bin")
|
||||
DATADIR_DEFINE(W04, "data/w04.bin")
|
||||
DATADIR_DEFINE(W05, "data/w05.bin")
|
||||
DATADIR_DEFINE(W06, "data/w06.bin")
|
||||
DATADIR_DEFINE(W10, "data/w10.bin")
|
||||
DATADIR_DEFINE(W20, "data/w20.bin")
|
||||
DATADIR_DEFINE(W21, "data/w21.bin")
|
||||
DATADIR_DEFINE(WALUIGI, "data/waluigi.bin")
|
||||
DATADIR_DEFINE(WALUIGIMDL0, "data/waluigimdl0.bin")
|
||||
DATADIR_DEFINE(WALUIGIMDL1, "data/waluigimdl1.bin")
|
||||
DATADIR_DEFINE(WALUIGIMOT, "data/waluigimot.bin")
|
||||
DATADIR_DEFINE(WARIO, "data/wario.bin")
|
||||
DATADIR_DEFINE(WARIOMDL0, "data/wariomdl0.bin")
|
||||
DATADIR_DEFINE(WARIOMDL1, "data/wariomdl1.bin")
|
||||
DATADIR_DEFINE(WARIOMOT, "data/wariomot.bin")
|
||||
DATADIR_DEFINE(WIN, "data/win.bin")
|
||||
DATADIR_DEFINE(YOSHI, "data/yoshi.bin")
|
||||
DATADIR_DEFINE(YOSHIMDL0, "data/yoshimdl0.bin")
|
||||
DATADIR_DEFINE(YOSHIMDL1, "data/yoshimdl1.bin")
|
||||
DATADIR_DEFINE(YOSHIMOT, "data/yoshimot.bin")
|
||||
DATADIR_DEFINE(ZTAR, "data/ztar.bin")
|
||||
|
|
@ -3,6 +3,8 @@
|
|||
|
||||
#include "game/dvd.h"
|
||||
|
||||
#include "datadir_enum.h"
|
||||
|
||||
#define DATA_DECODE_NONE 0
|
||||
#define DATA_DECODE_LZ 1
|
||||
#define DATA_DECODE_SLIDE 2
|
||||
|
|
@ -10,21 +12,10 @@
|
|||
#define DATA_DECODE_FSLIDE 4
|
||||
#define DATA_DECODE_RLE 5
|
||||
|
||||
#define MAKE_DATA_NUM(dir, file) (((dir) << 16)+(file))
|
||||
#define MAKE_DIR_NUM(dir) ((dir) << 16)
|
||||
|
||||
#define DATA_NUM_LISTEND -1
|
||||
|
||||
#include "dolphin/types.h"
|
||||
|
||||
#define DATADIR_DEFINE(name, path) name,
|
||||
|
||||
typedef enum {
|
||||
#include "datadir_table.h"
|
||||
DATADIR_COUNT
|
||||
} DataDirID;
|
||||
|
||||
#undef DATADIR_DEFINE
|
||||
|
||||
typedef struct data_read_stat {
|
||||
s32 dir_id;
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@
|
|||
#include "math.h"
|
||||
#include "rel_sqrt_consts.h"
|
||||
|
||||
#include "data_num/title.h"
|
||||
|
||||
#define HU_PAD_BTN_ALL (HuPadBtn[0] | HuPadBtn[1] | HuPadBtn[2] | HuPadBtn[3])
|
||||
#define HU_PAD_BTNDOWN_ALL (HuPadBtnDown[0] | HuPadBtnDown[1] | HuPadBtnDown[2] | HuPadBtnDown[3])
|
||||
#define HU_PAD_DSTK_ALL (HuPadDStkRep[0] | HuPadDStkRep[1] | HuPadDStkRep[2] | HuPadDStkRep[3])
|
||||
|
|
@ -86,7 +88,7 @@ static void BootProc(void)
|
|||
HuSprAttrSet(group, 0, SPRITE_ATTR_HIDDEN);
|
||||
if(omovlevtno != 0) {
|
||||
HuAudSndGrpSetSet(0);
|
||||
data = HuSprAnimReadFile(MAKE_DATA_NUM(DATADIR_TITLE, 1));
|
||||
data = HuSprAnimReadFile(TITLE_HUDSON_ANM);
|
||||
sprite_hudson = HuSprCreate(data, 0, 0);
|
||||
HuSprGrpMemberSet(group, 1, sprite_hudson);
|
||||
HuSprPosSet(group, 1, 288, 240);
|
||||
|
|
@ -116,7 +118,7 @@ static void BootProc(void)
|
|||
MGSeqInit();
|
||||
HuWinInit(1);
|
||||
TitleInit();
|
||||
data = HuSprAnimReadFile(MAKE_DATA_NUM(DATADIR_TITLE, 1));
|
||||
data = HuSprAnimReadFile(TITLE_HUDSON_ANM);
|
||||
sprite_hudson = HuSprCreate(data, 0, 0);
|
||||
HuSprGrpMemberSet(group, 1, sprite_hudson);
|
||||
HuSprPosSet(group, 1, 288, 240);
|
||||
|
|
@ -287,15 +289,15 @@ static void ProgressiveProc(void)
|
|||
VIFlush();
|
||||
}
|
||||
group = HuSprGrpCreate(3);
|
||||
data = HuSprAnimReadFile(MAKE_DATA_NUM(DATADIR_TITLE, 3));
|
||||
data = HuSprAnimReadFile(TITLE_PROGRESSIVE_CHOOSE_ANM);
|
||||
sprite = HuSprCreate(data, 0, 0);
|
||||
HuSprGrpMemberSet(group, 0, sprite);
|
||||
HuSprPosSet(group, 0, 288, 240);
|
||||
data = HuSprAnimReadFile(MAKE_DATA_NUM(DATADIR_TITLE, 6));
|
||||
data = HuSprAnimReadFile(TITLE_PROGRESSIVE_CURSOR_ON_ANM);
|
||||
sprite = HuSprCreate(data, 0, 0);
|
||||
HuSprGrpMemberSet(group, 1, sprite);
|
||||
HuSprPosSet(group, 1, progressivePosTbl[option*2], progressivePosTbl[(option*2)+1]);
|
||||
data = HuSprAnimReadFile(MAKE_DATA_NUM(DATADIR_TITLE, 7));
|
||||
data = HuSprAnimReadFile(TITLE_PROGRESSIVE_CURSOR_OFF_ANM);
|
||||
sprite = HuSprCreate(data, 0, 0);
|
||||
HuSprGrpMemberSet(group, 2, sprite);
|
||||
HuSprPosSet(group, 2, progressivePosTbl[option*2], progressivePosTbl[(option*2)+1]);
|
||||
|
|
@ -333,9 +335,9 @@ static void ProgressiveProc(void)
|
|||
HuSprGrpKill(group);
|
||||
group = HuSprGrpCreate(1);
|
||||
if(!option) {
|
||||
data = HuSprAnimReadFile(MAKE_DATA_NUM(DATADIR_TITLE, 4));
|
||||
data = HuSprAnimReadFile(TITLE_PROGRESSIVE_ON_ANM);
|
||||
} else {
|
||||
data = HuSprAnimReadFile(MAKE_DATA_NUM(DATADIR_TITLE, 5));
|
||||
data = HuSprAnimReadFile(TITLE_PROGRESSIVE_OFF_ANM);
|
||||
}
|
||||
sprite = HuSprCreate(data, 0, 0);
|
||||
HuSprGrpMemberSet(group, 0, sprite);
|
||||
|
|
@ -452,35 +454,35 @@ static void TitleInit(void)
|
|||
s16 model;
|
||||
s16 sprite;
|
||||
AnimData *sprite_data;
|
||||
titleModel[0] = model = Hu3DModelCreateFile(MAKE_DATA_NUM(DATADIR_TITLE, 11));
|
||||
titleModel[0] = model = Hu3DModelCreateFile(TITLE_CHAR_HSF);
|
||||
Hu3DModelAttrSet(model, 1);
|
||||
Hu3DModelAttrSet(model, 0x40000001);
|
||||
titleModel[1] = model = Hu3DModelCreateFile(MAKE_DATA_NUM(DATADIR_TITLE, 12));
|
||||
titleModel[1] = model = Hu3DModelCreateFile(TITLE_CUBE_HSF);
|
||||
Hu3DModelAttrSet(model, 1);
|
||||
Hu3DModelAttrSet(model, 0x40000001);
|
||||
titleModel[2] = model = Hu3DModelCreateFile(MAKE_DATA_NUM(DATADIR_TITLE, 13));
|
||||
titleModel[2] = model = Hu3DModelCreateFile(TITLE_SKY_HSF);
|
||||
Hu3DModelAttrSet(model, 1);
|
||||
Hu3DModelAttrSet(model, 0x40000001);
|
||||
Hu3DModelCameraInfoSet(model, 1);
|
||||
Hu3DModelLightInfoSet(model, 1);
|
||||
titleGroup = HuSprGrpCreate(4);
|
||||
sprite_data = HuSprAnimReadFile(MAKE_DATA_NUM(DATADIR_TITLE, 8));
|
||||
sprite_data = HuSprAnimReadFile(TITLE_BG_ANM);
|
||||
sprite = HuSprCreate(sprite_data, 0, 0);
|
||||
HuSprGrpMemberSet(titleGroup, 0, sprite);
|
||||
HuSprAttrSet(titleGroup, 0, SPRITE_ATTR_HIDDEN);
|
||||
HuSprDrawNoSet(titleGroup, 0, 127);
|
||||
HuSprPosSet(titleGroup, 0, 288, 240);
|
||||
sprite_data = HuSprAnimReadFile(MAKE_DATA_NUM(DATADIR_TITLE, 10));
|
||||
sprite_data = HuSprAnimReadFile(TITLE_COPYRIGHT_ANM);
|
||||
sprite = HuSprCreate(sprite_data, 1, 0);
|
||||
HuSprGrpMemberSet(titleGroup, 1, sprite);
|
||||
HuSprAttrSet(titleGroup, 1, SPRITE_ATTR_HIDDEN);
|
||||
HuSprPosSet(titleGroup, 1, 288, 420);
|
||||
sprite_data = HuSprAnimReadFile(MAKE_DATA_NUM(DATADIR_TITLE, 2));
|
||||
sprite_data = HuSprAnimReadFile(TITLE_PRESS_START_ANM);
|
||||
sprite = HuSprCreate(sprite_data, 2, 0);
|
||||
HuSprGrpMemberSet(titleGroup, 2, sprite);
|
||||
HuSprAttrSet(titleGroup, 2, SPRITE_ATTR_HIDDEN|SPRITE_ATTR_BILINEAR);
|
||||
HuSprPosSet(titleGroup, 2, 288, 380);
|
||||
sprite_data = HuSprAnimReadFile(MAKE_DATA_NUM(DATADIR_TITLE, 9));
|
||||
sprite_data = HuSprAnimReadFile(TITLE_LOGO_ANM);
|
||||
sprite = HuSprCreate(sprite_data, 0, 0);
|
||||
HuSprGrpMemberSet(titleGroup, 3, sprite);
|
||||
HuSprAttrSet(titleGroup, 3, SPRITE_ATTR_HIDDEN|SPRITE_ATTR_BILINEAR);
|
||||
|
|
|
|||
|
|
@ -44,18 +44,18 @@ u8 WipeStatGet(void);
|
|||
|
||||
//DATA
|
||||
w03StructUnk0 lbl_1_data_0[] = {
|
||||
{{0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, MAKE_DATA_NUM(0x0077, 0x0004)},
|
||||
{{145.0988f, 65.6173f, -2004.14f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, MAKE_DATA_NUM(0x0077, 0x0005)},
|
||||
{{-1548.14f, -1148.76f, -1095.54f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, MAKE_DATA_NUM(0x0077, 0x0006)},
|
||||
{{1050.0f, 50.0f, -1810.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, MAKE_DATA_NUM(0x0077, 0x000B)},
|
||||
{{-1950.0f, 50.0f, 1790.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 0.914f, 1.0f}, MAKE_DATA_NUM(0x0077, 0x000B)},
|
||||
{{1050.0f, 0.0f, -1750.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, MAKE_DATA_NUM(0x0077, 0x000A)},
|
||||
{{-1950.0f, 0.0f, 1850.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 0.914f, 1.0f}, MAKE_DATA_NUM(0x0077, 0x000A)},
|
||||
{{1950.0f, 0.0f, -1800.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, MAKE_DATA_NUM(0x0077, 0x0010)},
|
||||
{{-3150.0f, 0.0f, -600.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, MAKE_DATA_NUM(0x0077, 0x0011)},
|
||||
{{-3150.0f, 270.0f, -600.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, MAKE_DATA_NUM(0x0077, 0x0012)},
|
||||
{{2080.0f, 0.0f, -1635.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, MAKE_DATA_NUM(0x0002, 0x000D)},
|
||||
{{-3000.0f, 0.0f, -500.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, MAKE_DATA_NUM(0x0002, 0x000D)},
|
||||
{{0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W03, 0x0004)},
|
||||
{{145.0988f, 65.6173f, -2004.14f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W03, 0x0005)},
|
||||
{{-1548.14f, -1148.76f, -1095.54f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W03, 0x0006)},
|
||||
{{1050.0f, 50.0f, -1810.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W03, 0x000B)},
|
||||
{{-1950.0f, 50.0f, 1790.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 0.914f, 1.0f}, DATA_MAKE_NUM(DATADIR_W03, 0x000B)},
|
||||
{{1050.0f, 0.0f, -1750.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W03, 0x000A)},
|
||||
{{-1950.0f, 0.0f, 1850.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 0.914f, 1.0f}, DATA_MAKE_NUM(DATADIR_W03, 0x000A)},
|
||||
{{1950.0f, 0.0f, -1800.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W03, 0x0010)},
|
||||
{{-3150.0f, 0.0f, -600.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W03, 0x0011)},
|
||||
{{-3150.0f, 270.0f, -600.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W03, 0x0012)},
|
||||
{{2080.0f, 0.0f, -1635.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_BGUEST, 0x000D)},
|
||||
{{-3000.0f, 0.0f, -500.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_BGUEST, 0x000D)},
|
||||
};
|
||||
|
||||
s16 lbl_1_data_1E0 = -1;
|
||||
|
|
@ -80,12 +80,12 @@ w03StructUnk1 lbl_1_data_1EC = {
|
|||
};
|
||||
|
||||
s32 lbl_1_data_20C[] = {
|
||||
MAKE_DATA_NUM(0x0077, 0x001C),
|
||||
DATA_MAKE_NUM(DATADIR_W03, 0x001C),
|
||||
DATA_NUM_LISTEND
|
||||
};
|
||||
|
||||
s32 lbl_1_data_214[] = {
|
||||
MAKE_DATA_NUM(0x0002, 0x000E),
|
||||
DATA_MAKE_NUM(DATADIR_BGUEST, 0x000E),
|
||||
DATA_NUM_LISTEND
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -130,20 +130,20 @@ char* lbl_1_data_508[] = {
|
|||
};
|
||||
|
||||
s32 lbl_1_data_514[] = {
|
||||
MAKE_DATA_NUM(7, 0x6D),
|
||||
MAKE_DATA_NUM(7, 0x6E),
|
||||
MAKE_DATA_NUM(7, 0x6F),
|
||||
MAKE_DATA_NUM(7, 0x70),
|
||||
MAKE_DATA_NUM(7, 0x71),
|
||||
MAKE_DATA_NUM(7, 0x72),
|
||||
MAKE_DATA_NUM(7, 0x73),
|
||||
MAKE_DATA_NUM(7, 0x74),
|
||||
MAKE_DATA_NUM(7, 0x76),
|
||||
MAKE_DATA_NUM(7, 0x77),
|
||||
MAKE_DATA_NUM(7, 0x78),
|
||||
MAKE_DATA_NUM(7, 0x79),
|
||||
MAKE_DATA_NUM(7, 0x7A),
|
||||
MAKE_DATA_NUM(7, 0x7B),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x6D),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x6E),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x6F),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x70),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x71),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x72),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x73),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x74),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x76),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x77),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x78),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x79),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x7A),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x7B),
|
||||
};
|
||||
|
||||
//BSS
|
||||
|
|
|
|||
|
|
@ -41,26 +41,26 @@ s32 lbl_1_data_288 = -1;
|
|||
|
||||
char lbl_1_data_28C[] = "%d";
|
||||
|
||||
s32 lbl_1_data_290[] = { //TODO: make sure this actually uses MAKE_DATA_NUM macro
|
||||
MAKE_DATA_NUM(0x5F, 0x62),
|
||||
MAKE_DATA_NUM(0x1A, 0x62),
|
||||
MAKE_DATA_NUM(0x6D, 0x62),
|
||||
MAKE_DATA_NUM(0x8A, 0x62),
|
||||
MAKE_DATA_NUM(0x85, 0x62),
|
||||
MAKE_DATA_NUM(0x11, 0x62),
|
||||
MAKE_DATA_NUM(0x0D, 0x62),
|
||||
MAKE_DATA_NUM(0x81, 0x62),
|
||||
s32 lbl_1_data_290[] = { //TODO: make sure this actually uses DATA_MAKE_NUM macro
|
||||
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x62),
|
||||
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x62),
|
||||
DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x62),
|
||||
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x62),
|
||||
DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x62),
|
||||
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x62),
|
||||
DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x62),
|
||||
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x62),
|
||||
};
|
||||
|
||||
s32 lbl_1_data_2B0[] = { //TODO: make sure this actually uses MAKE_DATA_NUM macro
|
||||
MAKE_DATA_NUM(0x5F, 0x33),
|
||||
MAKE_DATA_NUM(0x1A, 0x33),
|
||||
MAKE_DATA_NUM(0x6D, 0x33),
|
||||
MAKE_DATA_NUM(0x8A, 0x33),
|
||||
MAKE_DATA_NUM(0x85, 0x33),
|
||||
MAKE_DATA_NUM(0x11, 0x33),
|
||||
MAKE_DATA_NUM(0x0D, 0x33),
|
||||
MAKE_DATA_NUM(0x81, 0x33),
|
||||
s32 lbl_1_data_2B0[] = { //TODO: make sure this actually uses DATA_MAKE_NUM macro
|
||||
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x33),
|
||||
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x33),
|
||||
DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x33),
|
||||
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x33),
|
||||
DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x33),
|
||||
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x33),
|
||||
DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x33),
|
||||
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x33),
|
||||
};
|
||||
|
||||
s32 lbl_1_data_2D0[] = {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#include "game/board/window.h"
|
||||
|
||||
s32 lbl_1_data_78[2] = {
|
||||
MAKE_DATA_NUM(DATADIR_W10, 16),
|
||||
DATA_MAKE_NUM(DATADIR_W10, 16),
|
||||
-1
|
||||
};
|
||||
|
||||
|
|
@ -14,7 +14,7 @@ Vec lbl_1_data_80[2] = {
|
|||
|
||||
void fn_1_AEC(void) {
|
||||
lbl_1_bss_1C = 0;
|
||||
lbl_1_bss_1E = BoardModelCreate(MAKE_DATA_NUM(DATADIR_W10, 15), lbl_1_data_78, 0);
|
||||
lbl_1_bss_1E = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W10, 15), lbl_1_data_78, 0);
|
||||
BoardModelMotionStart(lbl_1_bss_1E, 1, 0x40000001);
|
||||
BoardTutorialHostSet(lbl_1_bss_1E);
|
||||
BoardModelLayerSet(lbl_1_bss_1E, 6);
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ unkw10Dll lbl_1_data_0[1] = {
|
|||
3300.0f, 100.0f, -900.0f,
|
||||
0.0f, 0.0f, 0.0f,
|
||||
1.0f, 1.0f, 1.0f,
|
||||
MAKE_DATA_NUM(DATADIR_W10, 3)
|
||||
DATA_MAKE_NUM(DATADIR_W10, 3)
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -42,22 +42,22 @@ s32 lbl_1_data_34[] = {
|
|||
};
|
||||
|
||||
s32 lbl_1_data_54[2] = {
|
||||
MAKE_DATA_NUM(DATADIR_W10, 18),
|
||||
DATA_MAKE_NUM(DATADIR_W10, 18),
|
||||
DATA_NUM_LISTEND
|
||||
};
|
||||
|
||||
s32 lbl_1_data_5C[2] = {
|
||||
MAKE_DATA_NUM(DATADIR_BGUEST, 9),
|
||||
DATA_MAKE_NUM(DATADIR_BGUEST, 9),
|
||||
DATA_NUM_LISTEND
|
||||
};
|
||||
|
||||
s32 lbl_1_data_64[2] = {
|
||||
MAKE_DATA_NUM(DATADIR_BGUEST, 24),
|
||||
DATA_MAKE_NUM(DATADIR_BGUEST, 24),
|
||||
DATA_NUM_LISTEND
|
||||
};
|
||||
|
||||
s32 lbl_1_data_6C[2] = {
|
||||
MAKE_DATA_NUM(DATADIR_BGUEST, 14),
|
||||
DATA_MAKE_NUM(DATADIR_BGUEST, 14),
|
||||
DATA_NUM_LISTEND
|
||||
};
|
||||
|
||||
|
|
@ -85,26 +85,26 @@ void BoardCreate(void) {
|
|||
fn_1_AEC();
|
||||
fn_1_1D68();
|
||||
lbl_1_bss_C = 0;
|
||||
BoardSpaceInit(MAKE_DATA_NUM(DATADIR_W10, 0));
|
||||
BoardSpaceInit(DATA_MAKE_NUM(DATADIR_W10, 0));
|
||||
temp = BoardSpaceFlagSearch(0, 1);
|
||||
BoardTutorialBlockSetPos(temp, 1);
|
||||
lbl_1_data_28 = BoardModelCreate(MAKE_DATA_NUM(DATADIR_W10, 1), NULL, 0);
|
||||
lbl_1_data_28 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W10, 1), NULL, 0);
|
||||
fn_8006DDE8(lbl_1_data_28, -1.0f);
|
||||
BoardModelPosSet(lbl_1_data_28, 0.0f, 0.0f, 0.0f);
|
||||
BoardModelMotionStart(lbl_1_data_28, 0, 0x40000001);
|
||||
BoardModelMotionSpeedSet(lbl_1_data_28, 1.0f);
|
||||
lbl_1_data_2A = BoardModelCreate(MAKE_DATA_NUM(DATADIR_W10, 2), NULL, 0);
|
||||
lbl_1_data_2A = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W10, 2), NULL, 0);
|
||||
fn_8006DDE8(lbl_1_data_2A, -1.0f);
|
||||
BoardModelPosSet(lbl_1_data_2A, 0.0f, 0.0f, 0.0f);
|
||||
BoardModelMotionStart(lbl_1_data_2A, 0, 0x40000001);
|
||||
lbl_1_data_2C = BoardModelCreate(MAKE_DATA_NUM(DATADIR_W10, 17), lbl_1_data_54, 0);
|
||||
lbl_1_data_2C = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W10, 17), lbl_1_data_54, 0);
|
||||
BoardModelPosSet(lbl_1_data_2C, 0.0f, 0.0f, 0.0f);
|
||||
BoardModelMotionStart(lbl_1_data_2C, 1, 0x40000001);
|
||||
lbl_1_data_2E = BoardModelCreate(MAKE_DATA_NUM(DATADIR_BGUEST, 5), lbl_1_data_5C, 0);
|
||||
lbl_1_data_2E = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BGUEST, 5), lbl_1_data_5C, 0);
|
||||
BoardModelMotionStart(lbl_1_data_2E, 1, 0x40000001);
|
||||
lbl_1_data_32 = BoardModelCreate(MAKE_DATA_NUM(DATADIR_BGUEST, 18), lbl_1_data_64, 0);
|
||||
lbl_1_data_32 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BGUEST, 18), lbl_1_data_64, 0);
|
||||
BoardModelMotionStart(lbl_1_data_32, 1, 0x40000001);
|
||||
lbl_1_data_30 = BoardModelCreate(MAKE_DATA_NUM(DATADIR_BGUEST, 13), lbl_1_data_6C, 0);
|
||||
lbl_1_data_30 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BGUEST, 13), lbl_1_data_6C, 0);
|
||||
BoardModelMotionStart(lbl_1_data_30, 1, 0x40000001);
|
||||
BoardLightHookSet(&fn_1_8C0, &fn_1_904);
|
||||
for (i = 0; i < ARRAY_COUNT(lbl_1_data_0); i++) {
|
||||
|
|
|
|||
|
|
@ -68,17 +68,17 @@ w10DllUnk04 lbl_1_data_108[42] = {
|
|||
char lbl_1_data_258[] = "Tutorial Hook P0:%d P1:%d P2:%d P3:%d SCEN:%d CUE:%d PRM:%d DICE:%d MSG:%d\n";
|
||||
|
||||
s32 lbl_1_data_2A8[11] = {
|
||||
MAKE_DATA_NUM(DATADIR_W10, 4),
|
||||
MAKE_DATA_NUM(DATADIR_W10, 5),
|
||||
MAKE_DATA_NUM(DATADIR_W10, 6),
|
||||
MAKE_DATA_NUM(DATADIR_W10, 7),
|
||||
MAKE_DATA_NUM(DATADIR_W10, 8),
|
||||
MAKE_DATA_NUM(DATADIR_W10, 9),
|
||||
MAKE_DATA_NUM(DATADIR_W10, 10),
|
||||
MAKE_DATA_NUM(DATADIR_W10, 11),
|
||||
MAKE_DATA_NUM(DATADIR_W10, 12),
|
||||
MAKE_DATA_NUM(DATADIR_W10, 13),
|
||||
MAKE_DATA_NUM(DATADIR_W10, 14)
|
||||
DATA_MAKE_NUM(DATADIR_W10, 4),
|
||||
DATA_MAKE_NUM(DATADIR_W10, 5),
|
||||
DATA_MAKE_NUM(DATADIR_W10, 6),
|
||||
DATA_MAKE_NUM(DATADIR_W10, 7),
|
||||
DATA_MAKE_NUM(DATADIR_W10, 8),
|
||||
DATA_MAKE_NUM(DATADIR_W10, 9),
|
||||
DATA_MAKE_NUM(DATADIR_W10, 10),
|
||||
DATA_MAKE_NUM(DATADIR_W10, 11),
|
||||
DATA_MAKE_NUM(DATADIR_W10, 12),
|
||||
DATA_MAKE_NUM(DATADIR_W10, 13),
|
||||
DATA_MAKE_NUM(DATADIR_W10, 14)
|
||||
};
|
||||
|
||||
void fn_1_176C(void) {
|
||||
|
|
|
|||
|
|
@ -52,16 +52,16 @@ static omObjData *coinChgObj[4] = {
|
|||
};
|
||||
|
||||
static s32 coinDigitMdl[10] = {
|
||||
MAKE_DATA_NUM(DATADIR_BOARD, 12),
|
||||
MAKE_DATA_NUM(DATADIR_BOARD, 13),
|
||||
MAKE_DATA_NUM(DATADIR_BOARD, 14),
|
||||
MAKE_DATA_NUM(DATADIR_BOARD, 15),
|
||||
MAKE_DATA_NUM(DATADIR_BOARD, 16),
|
||||
MAKE_DATA_NUM(DATADIR_BOARD, 17),
|
||||
MAKE_DATA_NUM(DATADIR_BOARD, 18),
|
||||
MAKE_DATA_NUM(DATADIR_BOARD, 19),
|
||||
MAKE_DATA_NUM(DATADIR_BOARD, 20),
|
||||
MAKE_DATA_NUM(DATADIR_BOARD, 21),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 12),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 13),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 14),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 15),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 16),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 17),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 18),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 19),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 20),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 21),
|
||||
};
|
||||
|
||||
void BoardLandBlueExec(s32 player, s32 space) {
|
||||
|
|
@ -206,8 +206,8 @@ void BoardCoinChgHide(s32 index) {
|
|||
}
|
||||
|
||||
static const s32 coinSignMdl[2] = {
|
||||
MAKE_DATA_NUM(DATADIR_BOARD, 22),
|
||||
MAKE_DATA_NUM(DATADIR_BOARD, 23)
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 22),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 23)
|
||||
};
|
||||
|
||||
static void CreateCoinChg(coinChg *coin_chg, Vec *pos) {
|
||||
|
|
@ -221,7 +221,7 @@ static void CreateCoinChg(coinChg *coin_chg, Vec *pos) {
|
|||
coin_chg->sign_model = BoardModelCreate(coinSignMdl[coin_chg->minus], NULL, 0);
|
||||
coin_chg->tens_model = BoardModelCreate(coinDigitMdl[coin_chg->tens], NULL, 0);
|
||||
coin_chg->ones_model = BoardModelCreate(coinDigitMdl[coin_chg->ones], NULL, 0);
|
||||
coin_chg->coin_model = BoardModelCreate(MAKE_DATA_NUM(DATADIR_BOARD, 10), NULL, 0);
|
||||
coin_chg->coin_model = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 10), NULL, 0);
|
||||
BoardModelPosSetV(coin_chg->sign_model, pos);
|
||||
BoardModelPosSetV(coin_chg->tens_model, pos);
|
||||
BoardModelPosSetV(coin_chg->ones_model, pos);
|
||||
|
|
|
|||
|
|
@ -210,7 +210,7 @@ static void KillBoardFunc(omObjData *object)
|
|||
BoardTutorialWorkRestore();
|
||||
}
|
||||
_ClearFlag(FLAG_ID_MAKE(1, 0));
|
||||
HuARDirFree(MAKE_DIR_NUM(DATADIR_BOARD));
|
||||
HuARDirFree(DATADIR_BOARD);
|
||||
if(_CheckFlag(FLAG_ID_MAKE(1, 27))) {
|
||||
omOvlReturnEx(2, 1);
|
||||
} else {
|
||||
|
|
@ -668,7 +668,7 @@ static void CreateBoard(void)
|
|||
if(!reset_unk32) {
|
||||
GWSystem.unk_32 = 1;
|
||||
}
|
||||
guest_status = BoardDataDirReadAsync(MAKE_DIR_NUM(DATADIR_BGUEST));
|
||||
guest_status = BoardDataDirReadAsync(DATADIR_BGUEST);
|
||||
if(guest_status != -1) {
|
||||
BoardDataAsyncWait(guest_status);
|
||||
}
|
||||
|
|
@ -698,29 +698,29 @@ static void CreateBoard(void)
|
|||
BoardCameraMotionWait();
|
||||
BoardTauntInit();
|
||||
_SetFlag(FLAG_ID_MAKE(1, 14));
|
||||
HuDataDirClose(MAKE_DIR_NUM(DATADIR_BKOOPASUIT));
|
||||
HuDataDirClose(MAKE_DIR_NUM(DATADIR_BBATTLE));
|
||||
HuDataDirClose(MAKE_DIR_NUM(DATADIR_BKOOPA));
|
||||
HuDataDirClose(MAKE_DIR_NUM(DATADIR_BKUJIYA));
|
||||
HuDataDirClose(MAKE_DIR_NUM(DATADIR_BYOKODORI));
|
||||
HuDataDirClose(MAKE_DIR_NUM(DATADIR_BPAUSE));
|
||||
HuDataDirClose(MAKE_DIR_NUM(DATADIR_BLAST5));
|
||||
HuDataDirClose(MAKE_DIR_NUM(DATADIR_EFFECT));
|
||||
HuDataDirClose(DATADIR_BKOOPASUIT);
|
||||
HuDataDirClose(DATADIR_BBATTLE);
|
||||
HuDataDirClose(DATADIR_BKOOPA);
|
||||
HuDataDirClose(DATADIR_BKUJIYA);
|
||||
HuDataDirClose(DATADIR_BYOKODORI);
|
||||
HuDataDirClose(DATADIR_BPAUSE);
|
||||
HuDataDirClose(DATADIR_BLAST5);
|
||||
HuDataDirClose(DATADIR_EFFECT);
|
||||
_SetFlag(FLAG_ID_MAKE(1, 16));
|
||||
}
|
||||
|
||||
static void DestroyBoard(void)
|
||||
{
|
||||
s32 dir_table[] = {
|
||||
MAKE_DIR_NUM(DATADIR_W01),
|
||||
MAKE_DIR_NUM(DATADIR_W02),
|
||||
MAKE_DIR_NUM(DATADIR_W03),
|
||||
MAKE_DIR_NUM(DATADIR_W04),
|
||||
MAKE_DIR_NUM(DATADIR_W05),
|
||||
MAKE_DIR_NUM(DATADIR_W06),
|
||||
MAKE_DIR_NUM(DATADIR_W10),
|
||||
MAKE_DIR_NUM(DATADIR_W20),
|
||||
MAKE_DIR_NUM(DATADIR_W21),
|
||||
DATADIR_W01,
|
||||
DATADIR_W02,
|
||||
DATADIR_W03,
|
||||
DATADIR_W04,
|
||||
DATADIR_W05,
|
||||
DATADIR_W06,
|
||||
DATADIR_W10,
|
||||
DATADIR_W20,
|
||||
DATADIR_W21
|
||||
};
|
||||
BoardTauntKill();
|
||||
BoardAudSeqFadeOutAll();
|
||||
|
|
@ -738,14 +738,14 @@ static void DestroyBoard(void)
|
|||
BoardModelKillAll();
|
||||
BoardWinKillAll();
|
||||
HuDataDirClose(dir_table[BoardCurrGet()]);
|
||||
HuDataDirClose(MAKE_DIR_NUM(DATADIR_EFFECT));
|
||||
HuDataDirClose(MAKE_DIR_NUM(DATADIR_BGUEST));
|
||||
HuDataDirClose(MAKE_DIR_NUM(DATADIR_BKOOPASUIT));
|
||||
HuDataDirClose(MAKE_DIR_NUM(DATADIR_BBATTLE));
|
||||
HuDataDirClose(MAKE_DIR_NUM(DATADIR_BKOOPA));
|
||||
HuDataDirClose(MAKE_DIR_NUM(DATADIR_BKUJIYA));
|
||||
HuDataDirClose(MAKE_DIR_NUM(DATADIR_BYOKODORI));
|
||||
HuDataDirClose(MAKE_DIR_NUM(DATADIR_BOARD));
|
||||
HuDataDirClose(DATADIR_EFFECT);
|
||||
HuDataDirClose(DATADIR_BGUEST);
|
||||
HuDataDirClose(DATADIR_BKOOPASUIT);
|
||||
HuDataDirClose(DATADIR_BBATTLE);
|
||||
HuDataDirClose(DATADIR_BKOOPA);
|
||||
HuDataDirClose(DATADIR_BKUJIYA);
|
||||
HuDataDirClose(DATADIR_BYOKODORI);
|
||||
HuDataDirClose(DATADIR_BOARD);
|
||||
createFunc = destroyFunc = NULL;
|
||||
}
|
||||
|
||||
|
|
@ -1760,7 +1760,7 @@ void BoardConfettiCreate(Vec *pos, s16 count, float range)
|
|||
object->trans.y = pos->y;
|
||||
object->trans.z = pos->z;
|
||||
object->rot.x = range;
|
||||
work->gfx_mdl = BoardModelCreate(MAKE_DATA_NUM(DATADIR_BOARD, 7), NULL, 0);
|
||||
work->gfx_mdl = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 7), NULL, 0);
|
||||
BoardModelLayerSet(work->gfx_mdl, 2);
|
||||
BoardModelVisibilitySet(work->gfx_mdl, 0);
|
||||
{
|
||||
|
|
@ -1962,9 +1962,9 @@ typedef struct last5_gfx_work {
|
|||
} Last5GfxWork;
|
||||
|
||||
static s32 last5GfxSprTbl[3] = {
|
||||
MAKE_DATA_NUM(DATADIR_BOARD, 95),
|
||||
MAKE_DATA_NUM(DATADIR_BOARD, 97),
|
||||
MAKE_DATA_NUM(DATADIR_BOARD, 96),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 95),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 97),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 96),
|
||||
};
|
||||
|
||||
static float last5GfxPosTbl[2][3][2] = {
|
||||
|
|
@ -2019,7 +2019,7 @@ void BoardLast5GfxInit(void)
|
|||
}
|
||||
spr_file = last5GfxSprTbl[i];
|
||||
if(i == 2 && work->is_last && GWLanguageGet() != 0) {
|
||||
spr_file = MAKE_DATA_NUM(DATADIR_BOARD, 98);
|
||||
spr_file = DATA_MAKE_NUM(DATADIR_BOARD, 98);
|
||||
}
|
||||
BoardSpriteCreate(spr_file, prio, NULL, &work->sprites[i]);
|
||||
HuSprGrpMemberSet(work->group, i, work->sprites[i]);
|
||||
|
|
|
|||
|
|
@ -13,24 +13,15 @@ extern void BoardModelExistDupe(s16, s32);
|
|||
extern void BoardModelCameraSet(s16, u16);
|
||||
extern void BoardItemStatusKill(s32);
|
||||
extern void BoardModelAmbSet(s16, f32, f32, f32);
|
||||
extern void BoardModelPosSetV(s16, Vec*);
|
||||
extern void BoardModelPosSet(s16, f32, f32, f32);
|
||||
extern s32 BoardModelPosGet(s16, Vec*);
|
||||
extern void BoardModelRotSetV(s16, Vec*);
|
||||
extern void BoardModelRotSet(s16, f32, f32, f32);
|
||||
extern s32 BoardModelRotGet(s16, Vec*);
|
||||
extern void BoardModelRotYSet(s16, f32);
|
||||
extern f32 BoardModelRotYGet(s16);
|
||||
extern void BoardModelScaleSetV(s16, Vec*);
|
||||
extern void BoardModelScaleSet(s16, f32, f32, f32);
|
||||
extern void BoardModelScaleGet(s16, s32*);
|
||||
extern void BoardModelVoiceEnableSet(s16, s32, s32);
|
||||
extern s32 BoardModelMotionCreate(s16, s32);
|
||||
extern void BoardModelMotionKill(s16, s32);
|
||||
extern s32 BoardModelMotionEndCheck(s16);
|
||||
extern s32 BoardModelMotionStart(s16, s32, s32);
|
||||
extern s32 BoardModelMotionShiftSet(s16, s32, f32, f32, u32);
|
||||
extern void BoardModelMotionSpeedSet(s16, f32);
|
||||
extern void BoardModelMotionTimeSet(s16, f32);
|
||||
extern f32 BoardModelMotionTimeGet(s16);
|
||||
extern f32 BoardModelMotionMaxTimeGet(s16);
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@
|
|||
|
||||
|
||||
extern s16 BoardStarHostMdlGet(void);
|
||||
extern void BoardModelPosSetV(s16 model, Vec *pos);
|
||||
extern s16 BoardModelCreate(s32 file, s32 *data, s32 arg3);
|
||||
extern s16 BoardModelIDGet(s16 model);
|
||||
|
||||
|
|
@ -991,7 +990,7 @@ void BoardSpaceInit(s32 data_num)
|
|||
AnimData *data;
|
||||
void *data_base;
|
||||
s32 size;
|
||||
data = data_base = HuDataSelHeapReadNum(MAKE_DATA_NUM(DATADIR_BOARD, 29), MEMORY_DEFAULT_NUM, HEAP_DATA);
|
||||
data = data_base = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_BOARD, 29), MEMORY_DEFAULT_NUM, HEAP_DATA);
|
||||
data->bmp = (void *)((u32)data_base+(u32)data->bmp);
|
||||
data->pat = (void *)((u32)data_base+(u32)data->pat);
|
||||
data->bank = (void *)((u32)data_base+(u32)data->bank);
|
||||
|
|
@ -1023,7 +1022,7 @@ void BoardSpaceInit(s32 data_num)
|
|||
AnimData *data;
|
||||
void *data_base;
|
||||
s32 size;
|
||||
data = data_base = HuDataSelHeapReadNum(MAKE_DATA_NUM(DATADIR_BOARD, 28), MEMORY_DEFAULT_NUM, HEAP_DATA);
|
||||
data = data_base = HuDataSelHeapReadNum(DATA_MAKE_NUM(DATADIR_BOARD, 28), MEMORY_DEFAULT_NUM, HEAP_DATA);
|
||||
data->bmp = (void *)((u32)data_base+(u32)data->bmp);
|
||||
data->pat = (void *)((u32)data_base+(u32)data->pat);
|
||||
data->bank = (void *)((u32)data_base+(u32)data->bank);
|
||||
|
|
@ -1058,7 +1057,7 @@ void BoardSpaceInit(s32 data_num)
|
|||
GWSystem.star_flag = 0;
|
||||
}
|
||||
if(BoardCurrGet() != 7 && BoardCurrGet() != 8) {
|
||||
starPlatMdl = BoardModelCreate(MAKE_DATA_NUM(DATADIR_BOARD, 6), NULL, 0);
|
||||
starPlatMdl = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 6), NULL, 0);
|
||||
BoardModelMotionStart(starPlatMdl, 0, 0x40000001);
|
||||
BoardModelVisibilitySet(starPlatMdl, 0);
|
||||
if(_CheckFlag(FLAG_ID_MAKE(1, 1))) {
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ static void WarpInit(s32 player) {
|
|||
Vec pos;
|
||||
s16 player_mdl = BoardPlayerModelGet(player);
|
||||
|
||||
warpSpringMdl = BoardModelCreate(MAKE_DATA_NUM(DATADIR_BOARD, 1), NULL, 0);
|
||||
warpSpringMdl = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 1), NULL, 0);
|
||||
BoardSpacePosGet(0, GWPlayer[player].space_curr, &pos);
|
||||
warpYFloor = 1500.0f + pos.y;
|
||||
BoardModelLayerSet(warpSpringMdl, 2);
|
||||
|
|
@ -187,7 +187,7 @@ static void WarpStartImpact(s32 player) {
|
|||
warpImpactCnt++;
|
||||
}
|
||||
}
|
||||
warpImpactMdl = BoardModelCreate(MAKE_DATA_NUM(DATADIR_BOARD, 2), NULL, 0);
|
||||
warpImpactMdl = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 2), NULL, 0);
|
||||
BoardModelVisibilitySet(warpImpactMdl, 0);
|
||||
BoardModelMotionSpeedSet(warpImpactMdl, 0.0f);
|
||||
BoardCameraMoveSet(0);
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ static void **HuDataReadMultiSub(s32 *data_ids, BOOL use_num, s32 num);
|
|||
|
||||
#define DATADIR_DEFINE(name, path) { path, -1 },
|
||||
|
||||
static FileListEntry DataDirStat[DATADIR_COUNT+1] = {
|
||||
static FileListEntry DataDirStat[DATADIR_ID_MAX+1] = {
|
||||
#include "datadir_table.h"
|
||||
{ NULL, -1 }
|
||||
};
|
||||
|
|
|
|||
|
|
@ -399,7 +399,7 @@ static int SeqInitTimer(SeqWork *work, va_list params)
|
|||
work->work_float[0] = 0;
|
||||
work->spr_grp[0] = spr_grp = HuSprGrpCreate(4);
|
||||
HuSprGrpScaleSet(spr_grp, work->scale_x, work->scale_y);
|
||||
spr_anim = HuSprAnimRead(SeqReadFile(MAKE_DATA_NUM(DATADIR_GAMEMES, 2)));
|
||||
spr_anim = HuSprAnimRead(SeqReadFile(DATA_MAKE_NUM(DATADIR_GAMEMES, 2)));
|
||||
x = 12;
|
||||
for(i=0; i<2; i++) {
|
||||
sprite = HuSprCreate(spr_anim, 5, 0);
|
||||
|
|
@ -410,13 +410,13 @@ static int SeqInitTimer(SeqWork *work, va_list params)
|
|||
x -= 24;
|
||||
(void)i; //Hack for Matching
|
||||
}
|
||||
spr_anim = HuSprAnimRead(SeqReadFile(MAKE_DATA_NUM(DATADIR_GAMEMES, 1)));
|
||||
spr_anim = HuSprAnimRead(SeqReadFile(DATA_MAKE_NUM(DATADIR_GAMEMES, 1)));
|
||||
sprite = HuSprCreate(spr_anim, 7, 0);
|
||||
HuSprGrpMemberSet(spr_grp, 2, sprite);
|
||||
HuSprPosSet(spr_grp, 2, 0, 0);
|
||||
HuSprTPLvlSet(spr_grp, 2, 0.5f);
|
||||
HuSprColorSet(spr_grp, 2, 0, 0, 0);
|
||||
spr_anim = HuSprAnimRead(SeqReadFile(MAKE_DATA_NUM(DATADIR_GAMEMES, 0)));
|
||||
spr_anim = HuSprAnimRead(SeqReadFile(DATA_MAKE_NUM(DATADIR_GAMEMES, 0)));
|
||||
sprite = HuSprCreate(spr_anim, 6, 0);
|
||||
HuSprGrpMemberSet(spr_grp, 3, sprite);
|
||||
HuSprPosSet(spr_grp, 3, 0, 0);
|
||||
|
|
@ -907,23 +907,23 @@ static AnimData *SeqLoadFontChar(char *str, s16 flags)
|
|||
return NULL;
|
||||
}
|
||||
if(c == 32) {
|
||||
return HuSprAnimRead(SeqReadFile(MAKE_DATA_NUM(DATADIR_GAMEMES, 10)));
|
||||
return HuSprAnimRead(SeqReadFile(DATA_MAKE_NUM(DATADIR_GAMEMES, 10)));
|
||||
}
|
||||
for(id = 0, list=seqFontAlphaTbl; *list != 0; id++, list++) {
|
||||
if(*list == c) {
|
||||
data_num = MAKE_DATA_NUM(DATADIR_GAMEMES, id+21);
|
||||
data_num = DATA_MAKE_NUM(DATADIR_GAMEMES, id+21);
|
||||
return HuSprAnimRead(SeqReadFile(data_num));
|
||||
}
|
||||
}
|
||||
for(id = 0, list=seqFontNumTbl; *list != 0; id++, list++) {
|
||||
if(*list == c) {
|
||||
data_num = MAKE_DATA_NUM(DATADIR_GAMEMES, id+11);
|
||||
data_num = DATA_MAKE_NUM(DATADIR_GAMEMES, id+11);
|
||||
return HuSprAnimRead(SeqReadFile(data_num));
|
||||
}
|
||||
}
|
||||
for(id = 0, list=seqPunctTbl; *list != 0; id++, list++) {
|
||||
if(*list == c) {
|
||||
data_num = MAKE_DATA_NUM(DATADIR_GAMEMES, id+154);
|
||||
data_num = DATA_MAKE_NUM(DATADIR_GAMEMES, id+154);
|
||||
return HuSprAnimRead(SeqReadFile(data_num));
|
||||
}
|
||||
}
|
||||
|
|
@ -942,9 +942,9 @@ static AnimData *SeqLoadFontChar(char *str, s16 flags)
|
|||
while(*list != 0) {
|
||||
if(*list == c) {
|
||||
if(flags & 0x1) {
|
||||
data_num = MAKE_DATA_NUM(DATADIR_GAMEMES, id+156);
|
||||
data_num = DATA_MAKE_NUM(DATADIR_GAMEMES, id+156);
|
||||
} else {
|
||||
data_num = MAKE_DATA_NUM(DATADIR_GAMEMES, id+73);
|
||||
data_num = DATA_MAKE_NUM(DATADIR_GAMEMES, id+73);
|
||||
}
|
||||
return HuSprAnimRead(SeqReadFile(data_num));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
255, // record_idx
|
||||
0x170001, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M401), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 0), // inst_pic[0]
|
||||
DATADIR_M401, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 0), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 0), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 0), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210000, // rules_mess
|
||||
|
|
@ -28,11 +28,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
255, // record_idx
|
||||
0x170002, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M402), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 1), // inst_pic[0]
|
||||
DATADIR_M402, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 1), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 1), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 1), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210004, // rules_mess
|
||||
|
|
@ -46,11 +46,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
255, // record_idx
|
||||
0x170003, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M403), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 2), // inst_pic[0]
|
||||
DATADIR_M403, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 2), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 2), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 2), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210008, // rules_mess
|
||||
|
|
@ -64,11 +64,11 @@ MgInfo mgInfoTbl[] = {
|
|||
2, // flag
|
||||
255, // record_idx
|
||||
0x170004, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M404), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 3), // inst_pic[0]
|
||||
DATADIR_M404, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 3), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 3), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 3), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x21000C, // rules_mess
|
||||
|
|
@ -82,11 +82,11 @@ MgInfo mgInfoTbl[] = {
|
|||
2, // flag
|
||||
0, // record_idx
|
||||
0x170005, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M405), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 4), // inst_pic[0]
|
||||
DATADIR_M405, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 4), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 4), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 4), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210010, // rules_mess
|
||||
|
|
@ -100,11 +100,11 @@ MgInfo mgInfoTbl[] = {
|
|||
2, // flag
|
||||
255, // record_idx
|
||||
0x170006, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M406), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 5), // inst_pic[0]
|
||||
DATADIR_M406, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 5), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 5), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 5), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210014, // rules_mess
|
||||
|
|
@ -118,11 +118,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
1, // record_idx
|
||||
0x170007, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M407), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 6), // inst_pic[0]
|
||||
DATADIR_M407, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 6), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 6), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 6), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210018, // rules_mess
|
||||
|
|
@ -136,11 +136,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
255, // record_idx
|
||||
0x170008, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M408), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 7), // inst_pic[0]
|
||||
DATADIR_M408, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 7), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 7), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 7), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x21001C, // rules_mess
|
||||
|
|
@ -154,11 +154,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
255, // record_idx
|
||||
0x170009, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M409), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 8), // inst_pic[0]
|
||||
DATADIR_M409, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 8), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 8), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 8), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210020, // rules_mess
|
||||
|
|
@ -172,11 +172,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
255, // record_idx
|
||||
0x17000A, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M410), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 9), // inst_pic[0]
|
||||
DATADIR_M410, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 9), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 9), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 9), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210024, // rules_mess
|
||||
|
|
@ -190,13 +190,13 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
255, // record_idx
|
||||
0x17000B, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M411), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 10), // inst_pic[0]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 11), // inst_pic[1]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 12), // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 62), // mg_pic[0]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 11), // mg_pic[1]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 12), // mg_pic[2]
|
||||
DATADIR_M411, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 10), // inst_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 11), // inst_pic[1]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 12), // inst_pic[2]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 62), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 11), // mg_pic[1]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 12), // mg_pic[2]
|
||||
0x210028, // rules_mess
|
||||
0x210029, // control_mess[0]
|
||||
0, // control_mess[1]
|
||||
|
|
@ -208,11 +208,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
255, // record_idx
|
||||
0x17000C, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M412), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 13), // inst_pic[0]
|
||||
DATADIR_M412, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 13), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 13), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 13), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x21002C, // rules_mess
|
||||
|
|
@ -226,11 +226,11 @@ MgInfo mgInfoTbl[] = {
|
|||
2, // flag
|
||||
255, // record_idx
|
||||
0x17000D, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M413), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 14), // inst_pic[0]
|
||||
DATADIR_M413, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 14), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 63), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 63), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210030, // rules_mess
|
||||
|
|
@ -244,11 +244,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
255, // record_idx
|
||||
0x17000E, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M414), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 15), // inst_pic[0]
|
||||
DATADIR_M414, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 15), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 15), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 15), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210034, // rules_mess
|
||||
|
|
@ -262,11 +262,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
255, // record_idx
|
||||
0x17000F, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M415), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 16), // inst_pic[0]
|
||||
DATADIR_M415, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 16), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 16), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 16), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210038, // rules_mess
|
||||
|
|
@ -280,11 +280,11 @@ MgInfo mgInfoTbl[] = {
|
|||
1, // flag
|
||||
255, // record_idx
|
||||
0x170010, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M416), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 17), // inst_pic[0]
|
||||
DATADIR_M416, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 17), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 17), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 17), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x21003C, // rules_mess
|
||||
|
|
@ -298,11 +298,11 @@ MgInfo mgInfoTbl[] = {
|
|||
1, // flag
|
||||
255, // record_idx
|
||||
0x170011, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M417), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 18), // inst_pic[0]
|
||||
DATADIR_M417, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 18), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 18), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 18), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210040, // rules_mess
|
||||
|
|
@ -316,11 +316,11 @@ MgInfo mgInfoTbl[] = {
|
|||
1, // flag
|
||||
255, // record_idx
|
||||
0x170012, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M418), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 19), // inst_pic[0]
|
||||
DATADIR_M418, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 19), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 19), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 19), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210044, // rules_mess
|
||||
|
|
@ -334,11 +334,11 @@ MgInfo mgInfoTbl[] = {
|
|||
1, // flag
|
||||
255, // record_idx
|
||||
0x170013, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M419), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 20), // inst_pic[0]
|
||||
DATADIR_M419, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 20), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 20), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 20), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210048, // rules_mess
|
||||
|
|
@ -352,11 +352,11 @@ MgInfo mgInfoTbl[] = {
|
|||
0, // flag
|
||||
255, // record_idx
|
||||
0x170014, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M420), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 21), // inst_pic[0]
|
||||
DATADIR_M420, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 21), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 21), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 21), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x21004C, // rules_mess
|
||||
|
|
@ -370,11 +370,11 @@ MgInfo mgInfoTbl[] = {
|
|||
1, // flag
|
||||
255, // record_idx
|
||||
0x170015, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M421), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 22), // inst_pic[0]
|
||||
DATADIR_M421, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 22), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 22), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 22), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210050, // rules_mess
|
||||
|
|
@ -388,11 +388,11 @@ MgInfo mgInfoTbl[] = {
|
|||
1, // flag
|
||||
255, // record_idx
|
||||
0x170016, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M422), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 23), // inst_pic[0]
|
||||
DATADIR_M422, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 23), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 23), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 23), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210054, // rules_mess
|
||||
|
|
@ -406,11 +406,11 @@ MgInfo mgInfoTbl[] = {
|
|||
0, // flag
|
||||
255, // record_idx
|
||||
0x170017, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M423), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 24), // inst_pic[0]
|
||||
DATADIR_M423, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 24), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 24), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 24), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210058, // rules_mess
|
||||
|
|
@ -424,11 +424,11 @@ MgInfo mgInfoTbl[] = {
|
|||
0, // flag
|
||||
255, // record_idx
|
||||
0x170018, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M424), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 25), // inst_pic[0]
|
||||
DATADIR_M424, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 25), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 25), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 25), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x21005C, // rules_mess
|
||||
|
|
@ -442,11 +442,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
255, // record_idx
|
||||
0x170019, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M425), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 26), // inst_pic[0]
|
||||
DATADIR_M425, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 26), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 26), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 26), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210060, // rules_mess
|
||||
|
|
@ -460,11 +460,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
255, // record_idx
|
||||
0x17001A, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M426), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 27), // inst_pic[0]
|
||||
DATADIR_M426, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 27), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 27), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 27), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210064, // rules_mess
|
||||
|
|
@ -478,11 +478,11 @@ MgInfo mgInfoTbl[] = {
|
|||
2, // flag
|
||||
2, // record_idx
|
||||
0x17001B, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M427), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 28), // inst_pic[0]
|
||||
DATADIR_M427, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 28), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 28), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 28), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210068, // rules_mess
|
||||
|
|
@ -496,11 +496,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
255, // record_idx
|
||||
0x17001C, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M428), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 29), // inst_pic[0]
|
||||
DATADIR_M428, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 29), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 29), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 29), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x21006C, // rules_mess
|
||||
|
|
@ -514,11 +514,11 @@ MgInfo mgInfoTbl[] = {
|
|||
2, // flag
|
||||
255, // record_idx
|
||||
0x17001D, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M429), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 30), // inst_pic[0]
|
||||
DATADIR_M429, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 30), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 64), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 64), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210070, // rules_mess
|
||||
|
|
@ -532,11 +532,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
255, // record_idx
|
||||
0x17001E, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M430), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 31), // inst_pic[0]
|
||||
DATADIR_M430, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 31), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 31), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 31), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210074, // rules_mess
|
||||
|
|
@ -550,11 +550,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
255, // record_idx
|
||||
0x17001F, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M431), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 32), // inst_pic[0]
|
||||
DATADIR_M431, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 32), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 32), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 32), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210078, // rules_mess
|
||||
|
|
@ -568,11 +568,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
3, // record_idx
|
||||
0x170020, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M432), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 33), // inst_pic[0]
|
||||
DATADIR_M432, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 33), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 33), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 33), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x21007C, // rules_mess
|
||||
|
|
@ -586,11 +586,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
255, // record_idx
|
||||
0x170021, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M433), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 34), // inst_pic[0]
|
||||
DATADIR_M433, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 34), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 34), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 34), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210080, // rules_mess
|
||||
|
|
@ -604,11 +604,11 @@ MgInfo mgInfoTbl[] = {
|
|||
2, // flag
|
||||
255, // record_idx
|
||||
0x170022, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M434), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 35), // inst_pic[0]
|
||||
DATADIR_M434, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 35), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 35), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 35), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210084, // rules_mess
|
||||
|
|
@ -622,11 +622,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
255, // record_idx
|
||||
0x170023, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M435), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 36), // inst_pic[0]
|
||||
DATADIR_M435, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 36), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 36), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 36), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0, // rules_mess
|
||||
|
|
@ -640,11 +640,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
255, // record_idx
|
||||
0x170024, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M436), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 37), // inst_pic[0]
|
||||
DATADIR_M436, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 37), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 37), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 37), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0, // rules_mess
|
||||
|
|
@ -658,11 +658,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
255, // record_idx
|
||||
0x170025, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M437), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 38), // inst_pic[0]
|
||||
DATADIR_M437, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 38), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 38), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 38), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0, // rules_mess
|
||||
|
|
@ -676,11 +676,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
255, // record_idx
|
||||
0x170026, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M438), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 39), // inst_pic[0]
|
||||
DATADIR_M438, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 39), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 39), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 39), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210094, // rules_mess
|
||||
|
|
@ -694,11 +694,11 @@ MgInfo mgInfoTbl[] = {
|
|||
2, // flag
|
||||
255, // record_idx
|
||||
0x170027, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M439), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 40), // inst_pic[0]
|
||||
DATADIR_M439, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 40), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 40), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 40), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x210098, // rules_mess
|
||||
|
|
@ -712,11 +712,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
255, // record_idx
|
||||
0x170028, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M440), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 41), // inst_pic[0]
|
||||
DATADIR_M440, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 41), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 41), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 41), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x21009C, // rules_mess
|
||||
|
|
@ -730,11 +730,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
255, // record_idx
|
||||
0x170029, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M441), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 42), // inst_pic[0]
|
||||
DATADIR_M441, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 42), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 42), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 42), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x2100A0, // rules_mess
|
||||
|
|
@ -748,11 +748,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
255, // record_idx
|
||||
0x17002A, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M442), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 43), // inst_pic[0]
|
||||
DATADIR_M442, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 43), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 65), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 65), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x2100A4, // rules_mess
|
||||
|
|
@ -766,11 +766,11 @@ MgInfo mgInfoTbl[] = {
|
|||
2, // flag
|
||||
5, // record_idx
|
||||
0x17002B, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M443), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 44), // inst_pic[0]
|
||||
DATADIR_M443, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 44), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 44), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 44), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x2100A8, // rules_mess
|
||||
|
|
@ -784,11 +784,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
255, // record_idx
|
||||
0x17002C, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M444), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 45), // inst_pic[0]
|
||||
DATADIR_M444, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 45), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 45), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 45), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0, // rules_mess
|
||||
|
|
@ -802,11 +802,11 @@ MgInfo mgInfoTbl[] = {
|
|||
0, // flag
|
||||
255, // record_idx
|
||||
0x17002D, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M445), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 46), // inst_pic[0]
|
||||
DATADIR_M445, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 46), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 46), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 46), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x2100AC, // rules_mess
|
||||
|
|
@ -820,11 +820,11 @@ MgInfo mgInfoTbl[] = {
|
|||
0, // flag
|
||||
255, // record_idx
|
||||
0x17002E, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M446), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 47), // inst_pic[0]
|
||||
DATADIR_M446, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 47), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 47), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 47), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x2100B0, // rules_mess
|
||||
|
|
@ -838,11 +838,11 @@ MgInfo mgInfoTbl[] = {
|
|||
0, // flag
|
||||
255, // record_idx
|
||||
0x17002F, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M447), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 48), // inst_pic[0]
|
||||
DATADIR_M447, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 48), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 48), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 48), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x2100B4, // rules_mess
|
||||
|
|
@ -856,11 +856,11 @@ MgInfo mgInfoTbl[] = {
|
|||
0, // flag
|
||||
255, // record_idx
|
||||
0x170030, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M448), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 49), // inst_pic[0]
|
||||
DATADIR_M448, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 49), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 49), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 49), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x2100B8, // rules_mess
|
||||
|
|
@ -874,11 +874,11 @@ MgInfo mgInfoTbl[] = {
|
|||
0, // flag
|
||||
255, // record_idx
|
||||
0x170031, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M449), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 50), // inst_pic[0]
|
||||
DATADIR_M449, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 50), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 50), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 50), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x2100BC, // rules_mess
|
||||
|
|
@ -892,11 +892,11 @@ MgInfo mgInfoTbl[] = {
|
|||
0, // flag
|
||||
255, // record_idx
|
||||
0x170032, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M450), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 51), // inst_pic[0]
|
||||
DATADIR_M450, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 51), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 51), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 51), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x2100C0, // rules_mess
|
||||
|
|
@ -910,13 +910,13 @@ MgInfo mgInfoTbl[] = {
|
|||
0, // flag
|
||||
255, // record_idx
|
||||
0x170033, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M451), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 52), // inst_pic[0]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 53), // inst_pic[1]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 54), // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 52), // mg_pic[0]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 53), // mg_pic[1]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 54), // mg_pic[2]
|
||||
DATADIR_M451, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 52), // inst_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 53), // inst_pic[1]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 54), // inst_pic[2]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 52), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 53), // mg_pic[1]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 54), // mg_pic[2]
|
||||
0x2100C4, // rules_mess
|
||||
0x37000D, // control_mess[0]
|
||||
0, // control_mess[1]
|
||||
|
|
@ -928,11 +928,11 @@ MgInfo mgInfoTbl[] = {
|
|||
0, // flag
|
||||
255, // record_idx
|
||||
0x170033, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M450), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 55), // inst_pic[0]
|
||||
DATADIR_M450, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 55), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 55), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 55), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0, // rules_mess
|
||||
|
|
@ -946,11 +946,11 @@ MgInfo mgInfoTbl[] = {
|
|||
0, // flag
|
||||
255, // record_idx
|
||||
0x170034, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M450), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 50), // inst_pic[0]
|
||||
DATADIR_M450, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 50), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 50), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 50), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x2100C8, // rules_mess
|
||||
|
|
@ -964,11 +964,11 @@ MgInfo mgInfoTbl[] = {
|
|||
0, // flag
|
||||
255, // record_idx
|
||||
0x170033, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M450), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 55), // inst_pic[0]
|
||||
DATADIR_M450, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 55), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 55), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 55), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0, // rules_mess
|
||||
|
|
@ -982,11 +982,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
255, // record_idx
|
||||
0x170035, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M455), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 56), // inst_pic[0]
|
||||
DATADIR_M455, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 56), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 56), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 56), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x2100CC, // rules_mess
|
||||
|
|
@ -1000,11 +1000,11 @@ MgInfo mgInfoTbl[] = {
|
|||
3, // flag
|
||||
255, // record_idx
|
||||
0x170036, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M456), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 57), // inst_pic[0]
|
||||
DATADIR_M456, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 57), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 57), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 57), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0x2100D0, // rules_mess
|
||||
|
|
@ -1018,11 +1018,11 @@ MgInfo mgInfoTbl[] = {
|
|||
0, // flag
|
||||
255, // record_idx
|
||||
0x170037, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M457), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 58), // inst_pic[0]
|
||||
DATADIR_M457, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 58), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 58), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 58), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0, // rules_mess
|
||||
|
|
@ -1036,11 +1036,11 @@ MgInfo mgInfoTbl[] = {
|
|||
0, // flag
|
||||
255, // record_idx
|
||||
0x170038, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M458), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 59), // inst_pic[0]
|
||||
DATADIR_M458, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 59), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 59), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 59), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0, // rules_mess
|
||||
|
|
@ -1054,11 +1054,11 @@ MgInfo mgInfoTbl[] = {
|
|||
0, // flag
|
||||
255, // record_idx
|
||||
0x170038, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M458), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 50), // inst_pic[0]
|
||||
DATADIR_M458, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 50), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 50), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 50), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0, // rules_mess
|
||||
|
|
@ -1072,11 +1072,11 @@ MgInfo mgInfoTbl[] = {
|
|||
0, // flag
|
||||
255, // record_idx
|
||||
0x170038, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M458), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 50), // inst_pic[0]
|
||||
DATADIR_M458, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 50), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 50), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 50), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0, // rules_mess
|
||||
|
|
@ -1090,11 +1090,11 @@ MgInfo mgInfoTbl[] = {
|
|||
0, // flag
|
||||
255, // record_idx
|
||||
0x170038, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M458), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 50), // inst_pic[0]
|
||||
DATADIR_M458, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 50), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 50), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 50), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0, // rules_mess
|
||||
|
|
@ -1108,11 +1108,11 @@ MgInfo mgInfoTbl[] = {
|
|||
0, // flag
|
||||
255, // record_idx
|
||||
0x170038, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M458), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 50), // inst_pic[0]
|
||||
DATADIR_M458, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 50), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 50), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 50), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0, // rules_mess
|
||||
|
|
@ -1126,11 +1126,11 @@ MgInfo mgInfoTbl[] = {
|
|||
0, // flag
|
||||
255, // record_idx
|
||||
0x170038, // name_mess
|
||||
MAKE_DIR_NUM(DATADIR_M458), // data_dir
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 50), // inst_pic[0]
|
||||
DATADIR_M458, // data_dir
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 50), // inst_pic[0]
|
||||
0, // inst_pic[1]
|
||||
0, // inst_pic[2]
|
||||
MAKE_DATA_NUM(DATADIR_INSTPIC, 50), // mg_pic[0]
|
||||
DATA_MAKE_NUM(DATADIR_INSTPIC, 50), // mg_pic[0]
|
||||
0, // mg_pic[1]
|
||||
0, // mg_pic[2]
|
||||
0, // rules_mess
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@
|
|||
#include "stdarg.h"
|
||||
#include "string.h"
|
||||
|
||||
#include "data_num/win.h"
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ AnimData **anim;
|
||||
/* 0x04 */ s16 bank;
|
||||
|
|
@ -163,10 +165,10 @@ static u8 ATTRIBUTE_ALIGN(32) charColPal[2*3*10] = {
|
|||
};
|
||||
|
||||
static s32 frameFileTbl[] = {
|
||||
MAKE_DATA_NUM(DATADIR_WIN, 6),
|
||||
MAKE_DATA_NUM(DATADIR_WIN, 7),
|
||||
MAKE_DATA_NUM(DATADIR_WIN, 8),
|
||||
MAKE_DATA_NUM(DATADIR_WIN, 6)
|
||||
WIN_FRAME1_ANM,
|
||||
WIN_FRAME2_ANM,
|
||||
WIN_FRAME3_ANM,
|
||||
WIN_FRAME1_ANM
|
||||
};
|
||||
|
||||
static char *mesDataTbl[] = {
|
||||
|
|
@ -190,7 +192,7 @@ static s16 winPrio = 1000;
|
|||
void HuWindowInit(void) {
|
||||
s16 i;
|
||||
|
||||
winAMemP = HuAR_DVDtoARAM(MAKE_DIR_NUM(DATADIR_WIN));
|
||||
winAMemP = HuAR_DVDtoARAM(DATADIR_WIN);
|
||||
for (i = 0; i < 32; i++) {
|
||||
winData[i].group = -1;
|
||||
}
|
||||
|
|
@ -215,33 +217,33 @@ void HuWinInit(s32 mess_data_no) {
|
|||
}
|
||||
if (!fontAnim) {
|
||||
if (LanguageNo == 0) {
|
||||
anim_data = HuDataReadNum(MAKE_DATA_NUM(DATADIR_WIN, 0), MEMORY_DEFAULT_NUM);
|
||||
anim_data = HuDataReadNum(WIN_FONTJ_ANM, MEMORY_DEFAULT_NUM);
|
||||
} else {
|
||||
anim_data = HuDataReadNum(MAKE_DATA_NUM(DATADIR_WIN, 1), MEMORY_DEFAULT_NUM);
|
||||
anim_data = HuDataReadNum(WIN_FONTE_ANM, MEMORY_DEFAULT_NUM);
|
||||
}
|
||||
fontAnim = HuSprAnimRead(anim_data);
|
||||
}
|
||||
if (!iconAnim) {
|
||||
anim_data = HuDataReadNum(MAKE_DATA_NUM(DATADIR_WIN, 3), MEMORY_DEFAULT_NUM);
|
||||
anim_data = HuDataReadNum(WIN_ICON_ANM, MEMORY_DEFAULT_NUM);
|
||||
iconAnim = HuSprAnimRead(anim_data);
|
||||
HuSprAnimLock(iconAnim);
|
||||
}
|
||||
if (!cursorAnim) {
|
||||
anim_data = HuDataReadNum(MAKE_DATA_NUM(DATADIR_WIN, 2), MEMORY_DEFAULT_NUM);
|
||||
anim_data = HuDataReadNum(WIN_CURSOR_ANM, MEMORY_DEFAULT_NUM);
|
||||
cursorAnim = HuSprAnimRead(anim_data);
|
||||
HuSprAnimLock(cursorAnim);
|
||||
}
|
||||
if (!cardAnimA) {
|
||||
anim_data = HuDataReadNum(MAKE_DATA_NUM(DATADIR_WIN, 4), MEMORY_DEFAULT_NUM);
|
||||
anim_data = HuDataReadNum(WIN_CARDA_ANM, MEMORY_DEFAULT_NUM);
|
||||
cardAnimA = HuSprAnimRead(anim_data);
|
||||
HuSprAnimLock(cardAnimA);
|
||||
}
|
||||
if (!cardAnimB) {
|
||||
anim_data = HuDataReadNum(MAKE_DATA_NUM(DATADIR_WIN, 5), MEMORY_DEFAULT_NUM);
|
||||
anim_data = HuDataReadNum(WIN_CARDB_ANM, MEMORY_DEFAULT_NUM);
|
||||
cardAnimB = HuSprAnimRead(anim_data);
|
||||
HuSprAnimLock(cardAnimB);
|
||||
}
|
||||
HuDataDirClose(MAKE_DIR_NUM(DATADIR_WIN));
|
||||
HuDataDirClose(DATADIR_WIN);
|
||||
HuWinComKeyReset();
|
||||
winPrio = 1000;
|
||||
}
|
||||
|
|
@ -402,7 +404,7 @@ void HuWinAllKill(void) {
|
|||
HuMemDirectFree(messDataPtr);
|
||||
messDataPtr = 0;
|
||||
}
|
||||
HuDataDirClose(MAKE_DIR_NUM(DATADIR_WIN));
|
||||
HuDataDirClose(DATADIR_WIN);
|
||||
}
|
||||
|
||||
static void MesDispFunc(SpriteData *sprite) {
|
||||
|
|
@ -1775,25 +1777,25 @@ void HuWinDisablePlayerReset(s16 window, u8 player) {
|
|||
}
|
||||
|
||||
static s32 winPortraitTbl[] = {
|
||||
MAKE_DATA_NUM(DATADIR_WIN, 15),
|
||||
MAKE_DATA_NUM(DATADIR_WIN, 16),
|
||||
MAKE_DATA_NUM(DATADIR_WIN, 17),
|
||||
MAKE_DATA_NUM(DATADIR_WIN, 18),
|
||||
MAKE_DATA_NUM(DATADIR_WIN, 19),
|
||||
MAKE_DATA_NUM(DATADIR_WIN, 20),
|
||||
MAKE_DATA_NUM(DATADIR_WIN, 21),
|
||||
MAKE_DATA_NUM(DATADIR_WIN, 22),
|
||||
MAKE_DATA_NUM(DATADIR_WIN, 23),
|
||||
MAKE_DATA_NUM(DATADIR_WIN, 24),
|
||||
MAKE_DATA_NUM(DATADIR_WIN, 25),
|
||||
MAKE_DATA_NUM(DATADIR_WIN, 26),
|
||||
MAKE_DATA_NUM(DATADIR_WIN, 27),
|
||||
MAKE_DATA_NUM(DATADIR_WIN, 9),
|
||||
MAKE_DATA_NUM(DATADIR_WIN, 10),
|
||||
MAKE_DATA_NUM(DATADIR_WIN, 11),
|
||||
MAKE_DATA_NUM(DATADIR_WIN, 12),
|
||||
MAKE_DATA_NUM(DATADIR_WIN, 13),
|
||||
MAKE_DATA_NUM(DATADIR_WIN, 14)
|
||||
WIN_TOAD_TALK_ANM,
|
||||
WIN_BOBOMB_TALK_ANM,
|
||||
WIN_SHYGUY_TALK_ANM,
|
||||
WIN_BOO_TALK_ANM,
|
||||
WIN_GOOMBA_TALK_ANM,
|
||||
WIN_BOWSER_TALK_ANM,
|
||||
WIN_KKID_TALK_ANM,
|
||||
WIN_KOOPA_TALK_ANM,
|
||||
WIN_CONDOR_TALK_ANM,
|
||||
WIN_BOO_BLUE_TALK_ANM,
|
||||
WIN_DOLPHIN_TALK_ANM,
|
||||
WIN_BOO_RED_TALK_ANM,
|
||||
WIN_THWOMP_TALK_ANM,
|
||||
WIN_W01_HOST_TALK_ANM,
|
||||
WIN_W02_HOST_TALK_ANM,
|
||||
WIN_W03_HOST_TALK_ANM,
|
||||
WIN_W04_HOST_TALK_ANM,
|
||||
WIN_W05_HOST_TALK_ANM,
|
||||
WIN_W06_HOST_TALK_ANM
|
||||
};
|
||||
|
||||
s16 HuWinExCreate(float x, float y, s16 w, s16 h, s16 portrait) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue